[Qemu-devel] [PATCH] xen: Restrict build to x86 targets

[Jan Kiszka]

From: Jan Kiszka <address@hidden>

Xen target bits in qemu are intended for x86. Let the build system
reflect this and avoid useless building/linking for other targets.

Signed-off-by: Jan Kiszka <address@hidden>
---
 Makefile.objs   |    4 ++--
 Makefile.target |    4 ++--
 configure       |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile.objs b/Makefile.objs
index 13ba26f..eabb032 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -148,8 +148,8 @@ slirp-obj-y += tcp_subr.o tcp_timer.o udp.o bootp.o tftp.o
 common-obj-$(CONFIG_SLIRP) += $(addprefix slirp/, $(slirp-obj-y))
 
 # xen backend driver support
-common-obj-$(CONFIG_XEN) += xen_backend.o xen_devconfig.o
-common-obj-$(CONFIG_XEN) += xen_console.o xenfb.o xen_disk.o xen_nic.o
+common-obj-$(CONFIG_XEN_HOST) += xen_backend.o xen_devconfig.o
+common-obj-$(CONFIG_XEN_HOST) += xen_console.o xenfb.o xen_disk.o xen_nic.o
 
 ######################################################################
 # libuser
diff --git a/Makefile.target b/Makefile.target
index 5784844..0863d5c 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -203,8 +203,8 @@ QEMU_CFLAGS += $(VNC_SASL_CFLAGS)
 QEMU_CFLAGS += $(VNC_JPEG_CFLAGS)
 QEMU_CFLAGS += $(VNC_PNG_CFLAGS)
 
-# xen backend driver support
-obj-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o
+# xen target support
+obj-$(CONFIG_XEN_TARGET) += xen_machine_pv.o xen_domainbuild.o
 
 # USB layer
 obj-$(CONFIG_USB_OHCI) += usb-ohci.o
diff --git a/configure b/configure
index 2917874..3dd252a 100755
--- a/configure
+++ b/configure
@@ -2565,7 +2565,7 @@ if test "$bluez" = "yes" ; then
   echo "BLUEZ_CFLAGS=$bluez_cflags" >> $config_host_mak
 fi
 if test "$xen" = "yes" ; then
-  echo "CONFIG_XEN=y" >> $config_host_mak
+  echo "CONFIG_XEN_HOST=y" >> $config_host_mak
 fi
 if test "$io_thread" = "yes" ; then
   echo "CONFIG_IOTHREAD=y" >> $config_host_mak
@@ -2903,7 +2903,7 @@ echo "TARGET_ABI_DIR=$TARGET_ABI_DIR" >> 
$config_target_mak
 case "$target_arch2" in
   i386|x86_64)
     if test "$xen" = "yes" -a "$target_softmmu" = "yes" ; then
-      echo "CONFIG_XEN=y" >> $config_target_mak
+      echo "CONFIG_XEN_TARGET=y" >> $config_target_mak
     fi
 esac
 case "$target_arch2" in
-- 
1.7.1