From 958b0d0a03fe764c74a68ead36f815e7a21dba2c Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@qumranet.com>
Date: Mon, 26 Nov 2007 17:37:25 +0200
Subject: [PATCH] kvm: testsuite: move suport files to libcflat.a

Signed-off-by: Avi Kivity <avi@qumranet.com>
---
 kvm/user/config-x86-common.mak       | 17 +++++++----------
 kvm/user/main.c                      |  2 +-
 kvm/user/test/x86/{ => lib}/apic.h   |  0
 kvm/user/test/x86/{ => lib}/printf.c |  0
 kvm/user/test/x86/{ => lib}/printf.h |  0
 kvm/user/test/x86/{ => lib}/smp.c    |  0
 kvm/user/test/x86/{ => lib}/smp.h    |  0
 7 files changed, 8 insertions(+), 11 deletions(-)
 rename kvm/user/test/x86/{ => lib}/apic.h (100%)
 rename kvm/user/test/x86/{ => lib}/printf.c (100%)
 rename kvm/user/test/x86/{ => lib}/printf.h (100%)
 rename kvm/user/test/x86/{ => lib}/smp.c (100%)
 rename kvm/user/test/x86/{ => lib}/smp.h (100%)

diff --git a/kvm/user/config-x86-common.mak b/kvm/user/config-x86-common.mak
index a6253ce300..ace859b887 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 59c369e8de..213b019f53 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
similarity index 100%
rename from kvm/user/test/x86/apic.h
rename to kvm/user/test/x86/lib/apic.h
diff --git a/kvm/user/test/x86/printf.c b/kvm/user/test/x86/lib/printf.c
similarity index 100%
rename from kvm/user/test/x86/printf.c
rename to kvm/user/test/x86/lib/printf.c
diff --git a/kvm/user/test/x86/printf.h b/kvm/user/test/x86/lib/printf.h
similarity index 100%
rename from kvm/user/test/x86/printf.h
rename to kvm/user/test/x86/lib/printf.h
diff --git a/kvm/user/test/x86/smp.c b/kvm/user/test/x86/lib/smp.c
similarity index 100%
rename from kvm/user/test/x86/smp.c
rename to kvm/user/test/x86/lib/smp.c
diff --git a/kvm/user/test/x86/smp.h b/kvm/user/test/x86/lib/smp.h
similarity index 100%
rename from kvm/user/test/x86/smp.h
rename to kvm/user/test/x86/lib/smp.h
-- 
2.11.4.GIT