Compile most Xen files only once

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

diff --git a/Makefile b/Makefile
index bbb5e91..e993ec6 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 f327bf2..4de29f8 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 186e535..36596ba 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 2f2ec7f..76d07ec 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"
 
 /* ------------------------------------------------------------- */