From: Avi Kivity <[email protected]> No need for the extra level.
Signed-off-by: Avi Kivity <[email protected]> diff --git a/kvm/user/Makefile b/kvm/user/Makefile index ed462bb..18e25c6 100644 --- a/kvm/user/Makefile +++ b/kvm/user/Makefile @@ -10,11 +10,11 @@ CFLAGS = libgcc := $(shell $(CC) --print-libgcc-file-name) -libcflat := test/lib/libcflat.a +libcflat := lib/libcflat.a cflatobjs := \ - test/lib/panic.o \ - test/lib/printf.o \ - test/lib/string.o + lib/panic.o \ + lib/printf.o \ + lib/string.o #include architecure specific make rules include config-$(ARCH).mak diff --git a/kvm/user/config-i386.mak b/kvm/user/config-i386.mak index a9becfc..6dbd19f 100644 --- a/kvm/user/config-i386.mak +++ b/kvm/user/config-i386.mak @@ -1,4 +1,4 @@ -TEST_DIR=test/x86 +TEST_DIR=x86 cstart.o = $(TEST_DIR)/cstart.o bits = 32 ldarch = elf32-i386 diff --git a/kvm/user/config-powerpc-440.mak b/kvm/user/config-powerpc-440.mak index 12698e6..bb85971 100644 --- a/kvm/user/config-powerpc-440.mak +++ b/kvm/user/config-powerpc-440.mak @@ -1,15 +1,15 @@ # for some reason binutils hates tlbsx unless we say we're 405 :( -CFLAGS += -Wa,-m405 -I test/lib/powerpc/44x +CFLAGS += -Wa,-m405 -I lib/powerpc/44x cflatobjs += \ - test/lib/powerpc/44x/map.o \ - test/lib/powerpc/44x/tlbwe.o \ - test/lib/powerpc/44x/timebase.o + lib/powerpc/44x/map.o \ + lib/powerpc/44x/tlbwe.o \ + lib/powerpc/44x/timebase.o simpletests += \ - test/powerpc/44x/tlbsx.bin \ - test/powerpc/44x/tlbwe_16KB.bin \ - test/powerpc/44x/tlbwe_hole.bin \ - test/powerpc/44x/tlbwe.bin + powerpc/44x/tlbsx.bin \ + powerpc/44x/tlbwe_16KB.bin \ + powerpc/44x/tlbwe_hole.bin \ + powerpc/44x/tlbwe.bin diff --git a/kvm/user/config-powerpc.mak b/kvm/user/config-powerpc.mak index ec6086b..d053569 100644 --- a/kvm/user/config-powerpc.mak +++ b/kvm/user/config-powerpc.mak @@ -1,24 +1,24 @@ CFLAGS += -I../include/powerpc -CFLAGS += -Wa,-mregnames -I test/lib +CFLAGS += -Wa,-mregnames -I lib CFLAGS += -ffreestanding -cstart := test/powerpc/cstart.o +cstart := powerpc/cstart.o cflatobjs += \ - test/lib/powerpc/io.o + lib/powerpc/io.o $(libcflat): LDFLAGS += -nostdlib # these tests do not use libcflat simpletests := \ - test/powerpc/spin.bin \ - test/powerpc/io.bin \ - test/powerpc/sprg.bin + powerpc/spin.bin \ + powerpc/io.bin \ + powerpc/sprg.bin # theses tests use cstart.o, libcflat, and libgcc tests := \ - test/powerpc/exit.bin \ - test/powerpc/helloworld.bin + powerpc/exit.bin \ + powerpc/helloworld.bin include config-powerpc-$(PROCESSOR).mak diff --git a/kvm/user/config-x86-common.mak b/kvm/user/config-x86-common.mak index 035aa27..9084e2d 100644 --- a/kvm/user/config-x86-common.mak +++ b/kvm/user/config-x86-common.mak @@ -5,20 +5,20 @@ CFLAGS += -I../include/x86 all: test_cases cflatobjs += \ - test/lib/x86/io.o \ - test/lib/x86/smp.o + lib/x86/io.o \ + lib/x86/smp.o -cflatobjs += test/lib/x86/fwcfg.o -cflatobjs += test/lib/x86/apic.o +cflatobjs += lib/x86/fwcfg.o +cflatobjs += lib/x86/apic.o $(libcflat): LDFLAGS += -nostdlib -$(libcflat): CFLAGS += -ffreestanding -I test/lib +$(libcflat): CFLAGS += -ffreestanding -I lib CFLAGS += -m$(bits) libgcc := $(shell $(CC) -m$(bits) --print-libgcc-file-name) -FLATLIBS = test/lib/libcflat.a $(libgcc) +FLATLIBS = lib/libcflat.a $(libgcc) %.flat: %.o $(FLATLIBS) flat.lds $(CC) $(CFLAGS) -nostdlib -o $@ -Wl,-T,flat.lds $(filter %.o, $^) $(FLATLIBS) @@ -28,7 +28,7 @@ tests-common = $(TEST_DIR)/vmexit.flat $(TEST_DIR)/tsc.flat \ test_cases: $(tests-common) $(tests) -$(TEST_DIR)/%.o: CFLAGS += -std=gnu99 -ffreestanding -I test/lib -I test/lib/x86 +$(TEST_DIR)/%.o: CFLAGS += -std=gnu99 -ffreestanding -I lib -I lib/x86 $(TEST_DIR)/access.flat: $(cstart.o) $(TEST_DIR)/access.o $(TEST_DIR)/print.o @@ -62,4 +62,4 @@ arch_clean: $(RM) $(TEST_DIR)/*.o $(TEST_DIR)/*.flat \ $(TEST_DIR)/.*.d $(TEST_DIR)/lib/.*.d $(TEST_DIR)/lib/*.o --include $(TEST_DIR)/.*.d test/lib/.*.d test/lib/x86/.*.d +-include $(TEST_DIR)/.*.d lib/.*.d lib/x86/.*.d diff --git a/kvm/user/config-x86_64.mak b/kvm/user/config-x86_64.mak index 3403dc3..b898ece 100644 --- a/kvm/user/config-x86_64.mak +++ b/kvm/user/config-x86_64.mak @@ -1,4 +1,4 @@ -TEST_DIR=test/x86 +TEST_DIR=x86 cstart.o = $(TEST_DIR)/cstart64.o bits = 64 ldarch = elf64-x86-64 diff --git a/kvm/user/test/lib/libcflat.h b/kvm/user/lib/libcflat.h similarity index 100% rename from kvm/user/test/lib/libcflat.h rename to kvm/user/lib/libcflat.h diff --git a/kvm/user/test/lib/panic.c b/kvm/user/lib/panic.c similarity index 100% rename from kvm/user/test/lib/panic.c rename to kvm/user/lib/panic.c diff --git a/kvm/user/test/lib/powerpc/44x/map.c b/kvm/user/lib/powerpc/44x/map.c similarity index 100% rename from kvm/user/test/lib/powerpc/44x/map.c rename to kvm/user/lib/powerpc/44x/map.c diff --git a/kvm/user/test/lib/powerpc/44x/timebase.S b/kvm/user/lib/powerpc/44x/timebase.S similarity index 100% rename from kvm/user/test/lib/powerpc/44x/timebase.S rename to kvm/user/lib/powerpc/44x/timebase.S diff --git a/kvm/user/test/lib/powerpc/44x/timebase.h b/kvm/user/lib/powerpc/44x/timebase.h similarity index 100% rename from kvm/user/test/lib/powerpc/44x/timebase.h rename to kvm/user/lib/powerpc/44x/timebase.h diff --git a/kvm/user/test/lib/powerpc/44x/tlbwe.S b/kvm/user/lib/powerpc/44x/tlbwe.S similarity index 100% rename from kvm/user/test/lib/powerpc/44x/tlbwe.S rename to kvm/user/lib/powerpc/44x/tlbwe.S diff --git a/kvm/user/test/lib/powerpc/io.c b/kvm/user/lib/powerpc/io.c similarity index 100% rename from kvm/user/test/lib/powerpc/io.c rename to kvm/user/lib/powerpc/io.c diff --git a/kvm/user/test/lib/printf.c b/kvm/user/lib/printf.c similarity index 100% rename from kvm/user/test/lib/printf.c rename to kvm/user/lib/printf.c diff --git a/kvm/user/test/lib/string.c b/kvm/user/lib/string.c similarity index 100% rename from kvm/user/test/lib/string.c rename to kvm/user/lib/string.c diff --git a/kvm/user/test/lib/x86/apic-defs.h b/kvm/user/lib/x86/apic-defs.h similarity index 100% rename from kvm/user/test/lib/x86/apic-defs.h rename to kvm/user/lib/x86/apic-defs.h diff --git a/kvm/user/test/lib/x86/apic.c b/kvm/user/lib/x86/apic.c similarity index 100% rename from kvm/user/test/lib/x86/apic.c rename to kvm/user/lib/x86/apic.c diff --git a/kvm/user/test/lib/x86/apic.h b/kvm/user/lib/x86/apic.h similarity index 100% rename from kvm/user/test/lib/x86/apic.h rename to kvm/user/lib/x86/apic.h diff --git a/kvm/user/test/lib/x86/fake-apic.h b/kvm/user/lib/x86/fake-apic.h similarity index 100% rename from kvm/user/test/lib/x86/fake-apic.h rename to kvm/user/lib/x86/fake-apic.h diff --git a/kvm/user/test/lib/x86/fwcfg.c b/kvm/user/lib/x86/fwcfg.c similarity index 100% rename from kvm/user/test/lib/x86/fwcfg.c rename to kvm/user/lib/x86/fwcfg.c diff --git a/kvm/user/test/lib/x86/fwcfg.h b/kvm/user/lib/x86/fwcfg.h similarity index 100% rename from kvm/user/test/lib/x86/fwcfg.h rename to kvm/user/lib/x86/fwcfg.h diff --git a/kvm/user/test/lib/x86/io.c b/kvm/user/lib/x86/io.c similarity index 100% rename from kvm/user/test/lib/x86/io.c rename to kvm/user/lib/x86/io.c diff --git a/kvm/user/test/lib/x86/smp.c b/kvm/user/lib/x86/smp.c similarity index 100% rename from kvm/user/test/lib/x86/smp.c rename to kvm/user/lib/x86/smp.c diff --git a/kvm/user/test/lib/x86/smp.h b/kvm/user/lib/x86/smp.h similarity index 100% rename from kvm/user/test/lib/x86/smp.h rename to kvm/user/lib/x86/smp.h diff --git a/kvm/user/test/x86/README b/kvm/user/x86/README similarity index 100% rename from kvm/user/test/x86/README rename to kvm/user/x86/README diff --git a/kvm/user/test/x86/access.c b/kvm/user/x86/access.c similarity index 100% rename from kvm/user/test/x86/access.c rename to kvm/user/x86/access.c diff --git a/kvm/user/test/x86/apic.c b/kvm/user/x86/apic.c similarity index 100% rename from kvm/user/test/x86/apic.c rename to kvm/user/x86/apic.c diff --git a/kvm/user/test/x86/cstart.S b/kvm/user/x86/cstart.S similarity index 100% rename from kvm/user/test/x86/cstart.S rename to kvm/user/x86/cstart.S diff --git a/kvm/user/test/x86/cstart64.S b/kvm/user/x86/cstart64.S similarity index 100% rename from kvm/user/test/x86/cstart64.S rename to kvm/user/x86/cstart64.S diff --git a/kvm/user/test/x86/emulator.c b/kvm/user/x86/emulator.c similarity index 100% rename from kvm/user/test/x86/emulator.c rename to kvm/user/x86/emulator.c diff --git a/kvm/user/test/x86/hypercall.c b/kvm/user/x86/hypercall.c similarity index 100% rename from kvm/user/test/x86/hypercall.c rename to kvm/user/x86/hypercall.c diff --git a/kvm/user/test/x86/ioram.h b/kvm/user/x86/ioram.h similarity index 100% rename from kvm/user/test/x86/ioram.h rename to kvm/user/x86/ioram.h diff --git a/kvm/user/test/x86/msr.c b/kvm/user/x86/msr.c similarity index 100% rename from kvm/user/test/x86/msr.c rename to kvm/user/x86/msr.c diff --git a/kvm/user/test/x86/port80.c b/kvm/user/x86/port80.c similarity index 100% rename from kvm/user/test/x86/port80.c rename to kvm/user/x86/port80.c diff --git a/kvm/user/test/x86/print.S b/kvm/user/x86/print.S similarity index 100% rename from kvm/user/test/x86/print.S rename to kvm/user/x86/print.S diff --git a/kvm/user/test/x86/print.h b/kvm/user/x86/print.h similarity index 100% rename from kvm/user/test/x86/print.h rename to kvm/user/x86/print.h diff --git a/kvm/user/test/x86/realmode.c b/kvm/user/x86/realmode.c similarity index 100% rename from kvm/user/test/x86/realmode.c rename to kvm/user/x86/realmode.c diff --git a/kvm/user/test/x86/realmode.lds b/kvm/user/x86/realmode.lds similarity index 100% rename from kvm/user/test/x86/realmode.lds rename to kvm/user/x86/realmode.lds diff --git a/kvm/user/test/x86/sieve.c b/kvm/user/x86/sieve.c similarity index 100% rename from kvm/user/test/x86/sieve.c rename to kvm/user/x86/sieve.c diff --git a/kvm/user/test/x86/smptest.c b/kvm/user/x86/smptest.c similarity index 100% rename from kvm/user/test/x86/smptest.c rename to kvm/user/x86/smptest.c diff --git a/kvm/user/test/x86/taskswitch.c b/kvm/user/x86/taskswitch.c similarity index 100% rename from kvm/user/test/x86/taskswitch.c rename to kvm/user/x86/taskswitch.c diff --git a/kvm/user/test/x86/tsc.c b/kvm/user/x86/tsc.c similarity index 100% rename from kvm/user/test/x86/tsc.c rename to kvm/user/x86/tsc.c diff --git a/kvm/user/test/x86/vm.c b/kvm/user/x86/vm.c similarity index 100% rename from kvm/user/test/x86/vm.c rename to kvm/user/x86/vm.c diff --git a/kvm/user/test/x86/vm.h b/kvm/user/x86/vm.h similarity index 100% rename from kvm/user/test/x86/vm.h rename to kvm/user/x86/vm.h diff --git a/kvm/user/test/x86/vmexit.c b/kvm/user/x86/vmexit.c similarity index 100% rename from kvm/user/test/x86/vmexit.c rename to kvm/user/x86/vmexit.c -- To unsubscribe from this list: send the line "unsubscribe kvm-commits" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
