Commit 2567f5796c38238d6f2055f074e347a0338140ce

Authored by Blue Swirl
1 parent e20a8dff

Compile most Xen files only once

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Makefile
@@ -189,6 +189,13 @@ endif @@ -189,6 +189,13 @@ endif
189 189
190 LIBS+=$(VDE_LIBS) 190 LIBS+=$(VDE_LIBS)
191 191
  192 +# xen backend driver support
  193 +XEN_OBJS := xen_backend.o xen_devconfig.o
  194 +XEN_OBJS += xen_console.o xenfb.o xen_disk.o xen_nic.o
  195 +ifdef CONFIG_XEN
  196 + OBJS += $(XEN_OBJS)
  197 +endif
  198 +
192 cocoa.o: cocoa.m 199 cocoa.o: cocoa.m
193 200
194 keymaps.o: keymaps.c keymaps.h 201 keymaps.o: keymaps.c keymaps.h
Makefile.target
@@ -541,8 +541,7 @@ LIBS += $(CONFIG_BLUEZ_LIBS) @@ -541,8 +541,7 @@ LIBS += $(CONFIG_BLUEZ_LIBS)
541 endif 541 endif
542 542
543 # xen backend driver support 543 # xen backend driver support
544 -XEN_OBJS := xen_machine_pv.o xen_backend.o xen_devconfig.o xen_domainbuild.o  
545 -XEN_OBJS += xen_console.o xenfb.o xen_disk.o xen_nic.o 544 +XEN_OBJS := xen_machine_pv.o xen_domainbuild.o
546 ifeq ($(CONFIG_XEN), yes) 545 ifeq ($(CONFIG_XEN), yes)
547 OBJS += $(XEN_OBJS) 546 OBJS += $(XEN_OBJS)
548 LIBS += $(XEN_LIBS) 547 LIBS += $(XEN_LIBS)
configure
@@ -1708,6 +1708,11 @@ else @@ -1708,6 +1708,11 @@ else
1708 exit 1 1708 exit 1
1709 fi 1709 fi
1710 1710
  1711 +if test "$xen" = "yes" ;
  1712 + then
  1713 + echo "CONFIG_XEN=yes" >> $config_mak
  1714 +fi
  1715 +
1711 tools= 1716 tools=
1712 if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then 1717 if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then
1713 tools="qemu-img\$(EXESUF) $tools" 1718 tools="qemu-img\$(EXESUF) $tools"
hw/xen_backend.c
@@ -38,6 +38,7 @@ @@ -38,6 +38,7 @@
38 38
39 #include "hw.h" 39 #include "hw.h"
40 #include "qemu-char.h" 40 #include "qemu-char.h"
  41 +#include "qemu-log.h"
41 #include "xen_backend.h" 42 #include "xen_backend.h"
42 43
43 /* ------------------------------------------------------------- */ 44 /* ------------------------------------------------------------- */