Compile most Xen files only once

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

diff --git a/Makefile b/Makefile
index bbb5e9107b2968709b2f3f4219c2811c5d421168..e993ec6dd1a29d7cf4ea36d17d5bd0d8ce07fdd9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -189,6 +189,13 @@ endif
 
 LIBS+=$(VDE_LIBS)
 
+# xen backend driver support
+XEN_OBJS := xen_backend.o xen_devconfig.o
+XEN_OBJS += xen_console.o xenfb.o xen_disk.o xen_nic.o
+ifdef CONFIG_XEN
+  OBJS += $(XEN_OBJS)
+endif
+
 cocoa.o: cocoa.m
 
 keymaps.o: keymaps.c keymaps.h

diff --git a/Makefile.target b/Makefile.target
index f327bf2f44cd2a771c3cb4f24b67364ed2c9e44b..4de29f831d3980c16dd0c5467c9e434f521499b5 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -541,8 +541,7 @@ LIBS += $(CONFIG_BLUEZ_LIBS)
 endif
 
 # xen backend driver support
-XEN_OBJS := xen_machine_pv.o xen_backend.o xen_devconfig.o xen_domainbuild.o
-XEN_OBJS += xen_console.o xenfb.o xen_disk.o xen_nic.o
+XEN_OBJS := xen_machine_pv.o xen_domainbuild.o
 ifeq ($(CONFIG_XEN), yes)
   OBJS += $(XEN_OBJS)
   LIBS += $(XEN_LIBS)

diff --git a/configure b/configure
index 186e5357688c8e80756bd7a151fa56b6801360b8..36596ba96b2ec135ad8f04c7b6769a8e8f3b251f 100755 (executable)
--- a/configure
+++ b/configure
@@ -1708,6 +1708,11 @@ else
     exit 1
 fi
 
+if test "$xen" = "yes" ;
+    then
+    echo "CONFIG_XEN=yes" >> $config_mak
+fi
+
 tools=
 if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then
   tools="qemu-img\$(EXESUF) $tools"

diff --git a/hw/xen_backend.c b/hw/xen_backend.c
index 2f2ec7ffe003e3e946b5e8f98224e4ebe9d2194f..76d07ecd384f2dfe27bc6959c67947f339c88616 100644 (file)
--- a/hw/xen_backend.c
+++ b/hw/xen_backend.c
@@ -38,6 +38,7 @@
 
 #include "hw.h"
 #include "qemu-char.h"
+#include "qemu-log.h"
 #include "xen_backend.h"
 
 /* ------------------------------------------------------------- */