diff options
author | Avi Kivity <avi@qumranet.com> | 2007-11-26 17:37:25 +0200 |
---|---|---|
committer | Avi Kivity <avi@qumranet.com> | 2007-11-26 17:37:25 +0200 |
commit | 958b0d0a03fe764c74a68ead36f815e7a21dba2c (patch) | |
tree | 6db9055276f98daeb65a6a4fdd6fa08702a4d76c | |
parent | ede8ba4cbaa168dffab9da384f990e618b7a9776 (diff) |
kvm: testsuite: move suport files to libcflat.a
Signed-off-by: Avi Kivity <avi@qumranet.com>
-rw-r--r-- | kvm/user/config-x86-common.mak | 17 | ||||
-rw-r--r-- | kvm/user/main.c | 2 | ||||
-rw-r--r-- | kvm/user/test/x86/lib/apic.h (renamed from kvm/user/test/x86/apic.h) | 0 | ||||
-rw-r--r-- | kvm/user/test/x86/lib/printf.c (renamed from kvm/user/test/x86/printf.c) | 0 | ||||
-rw-r--r-- | kvm/user/test/x86/lib/printf.h (renamed from kvm/user/test/x86/printf.h) | 0 | ||||
-rw-r--r-- | kvm/user/test/x86/lib/smp.c (renamed from kvm/user/test/x86/smp.c) | 0 | ||||
-rw-r--r-- | kvm/user/test/x86/lib/smp.h (renamed from kvm/user/test/x86/smp.h) | 0 |
7 files changed, 8 insertions, 11 deletions
diff --git a/kvm/user/config-x86-common.mak b/kvm/user/config-x86-common.mak index a6253ce30..ace859b88 100644 --- a/kvm/user/config-x86-common.mak +++ b/kvm/user/config-x86-common.mak @@ -12,31 +12,28 @@ tests-common = $(TEST_DIR)/bootstrap \ test_cases: $(tests-common) $(tests) -$(TEST_DIR)/%.o: CFLAGS += -std=gnu99 -ffreestanding +$(TEST_DIR)/%.o: CFLAGS += -std=gnu99 -ffreestanding -I$(TEST_DIR)/lib $(TEST_DIR)/bootstrap: $(TEST_DIR)/bootstrap.o $(CC) -nostdlib -o $@ -Wl,-T,bootstrap.lds $^ $(TEST_DIR)/irq.flat: $(TEST_DIR)/print.o -$(TEST_DIR)/access.flat: $(cstart.o) $(TEST_DIR)/access.o \ - $(TEST_DIR)/printf.o $(TEST_DIR)/print.o $(TEST_DIR)/smp.o +$(TEST_DIR)/access.flat: $(cstart.o) $(TEST_DIR)/access.o $(TEST_DIR)/print.o $(TEST_DIR)/sieve.flat: $(cstart.o) $(TEST_DIR)/sieve.o \ $(TEST_DIR)/print.o $(TEST_DIR)/vm.o -$(TEST_DIR)/vmexit.flat: $(cstart.o) $(TEST_DIR)/vmexit.o \ - $(TEST_DIR)/printf.o $(TEST_DIR)/smp.o +$(TEST_DIR)/vmexit.flat: $(cstart.o) $(TEST_DIR)/vmexit.o $(TEST_DIR)/test32.flat: $(TEST_DIR)/test32.o -$(TEST_DIR)/smp.flat: $(cstart.o) $(TEST_DIR)/smp.o $(TEST_DIR)/printf.o \ - $(TEST_DIR)/smptest.o +$(TEST_DIR)/smp.flat: $(cstart.o) $(TEST_DIR)/smptest.o -$(TEST_DIR)/emulator.flat: $(cstart.o) $(TEST_DIR)/printf.o $(TEST_DIR)/vm.o \ - $(TEST_DIR)/smp.o $(TEST_DIR)/print.o +$(TEST_DIR)/emulator.flat: $(cstart.o) $(TEST_DIR)/vm.o $(TEST_DIR)/print.o -$(TEST_DIR)/libcflat.a: $(TEST_DIR)/lib/exit.o +$(TEST_DIR)/libcflat.a: $(TEST_DIR)/lib/exit.o $(TEST_DIR)/lib/printf.o \ + $(TEST_DIR)/lib/smp.o ar rcs $@ $^ arch_clean: diff --git a/kvm/user/main.c b/kvm/user/main.c index 59c369e8d..213b019f5 100644 --- a/kvm/user/main.c +++ b/kvm/user/main.c @@ -17,7 +17,7 @@ #define _GNU_SOURCE #include <libkvm.h> -#include "test/x86/apic.h" +#include "test/x86/lib/apic.h" #include "test/x86/ioram.h" #include <stdio.h> diff --git a/kvm/user/test/x86/apic.h b/kvm/user/test/x86/lib/apic.h index eed63baef..eed63baef 100644 --- a/kvm/user/test/x86/apic.h +++ b/kvm/user/test/x86/lib/apic.h diff --git a/kvm/user/test/x86/printf.c b/kvm/user/test/x86/lib/printf.c index f13bf0cc5..f13bf0cc5 100644 --- a/kvm/user/test/x86/printf.c +++ b/kvm/user/test/x86/lib/printf.c diff --git a/kvm/user/test/x86/printf.h b/kvm/user/test/x86/lib/printf.h index 7d4b779ca..7d4b779ca 100644 --- a/kvm/user/test/x86/printf.h +++ b/kvm/user/test/x86/lib/printf.h diff --git a/kvm/user/test/x86/smp.c b/kvm/user/test/x86/lib/smp.c index a4cbe6147..a4cbe6147 100644 --- a/kvm/user/test/x86/smp.c +++ b/kvm/user/test/x86/lib/smp.c diff --git a/kvm/user/test/x86/smp.h b/kvm/user/test/x86/lib/smp.h index bcf76a357..bcf76a357 100644 --- a/kvm/user/test/x86/smp.h +++ b/kvm/user/test/x86/lib/smp.h |