Patchwork [V8,02/16] xen: Make xen build only on x86 target.

login
register
mail settings
Submitter Anthony PERARD
Date Dec. 1, 2010, 5:39 p.m.
Message ID <1291225188-9972-3-git-send-email-anthony.perard@citrix.com>
Download mbox | patch
Permalink /patch/73851/
State New
Headers show

Comments

Anthony PERARD - Dec. 1, 2010, 5:39 p.m.
From: Anthony PERARD <anthony.perard@citrix.com>

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
 Makefile.objs   |    4 ----
 Makefile.target |    4 +++-
 configure       |    5 +----
 3 files changed, 4 insertions(+), 9 deletions(-)

Patch

diff --git a/Makefile.objs b/Makefile.objs
index 23b17ce..e2bf50e 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -142,10 +142,6 @@  slirp-obj-y += slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o
 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
-
 ######################################################################
 # libuser
 
diff --git a/Makefile.target b/Makefile.target
index 2800f47..0050103 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -204,7 +204,9 @@  QEMU_CFLAGS += $(VNC_JPEG_CFLAGS)
 QEMU_CFLAGS += $(VNC_PNG_CFLAGS)
 
 # xen backend driver support
-obj-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o
+obj-$(CONFIG_XEN) += xen_backend.o xen_devconfig.o
+obj-$(CONFIG_XEN) += xen_console.o xenfb.o xen_disk.o xen_nic.o
+obj-i386-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o
 
 # USB layer
 obj-$(CONFIG_USB_OHCI) += usb-ohci.o
diff --git a/configure b/configure
index 2917874..dfffbad 100755
--- a/configure
+++ b/configure
@@ -1145,7 +1145,6 @@  int main(void) { xs_daemon_open(); xc_interface_open(); return 0; }
 EOF
   if compile_prog "" "$xen_libs" ; then
     xen=yes
-    libs_softmmu="$xen_libs $libs_softmmu"
   else
     if test "$xen" = "yes" ; then
       feature_not_found "xen"
@@ -2564,9 +2563,6 @@  if test "$bluez" = "yes" ; then
   echo "CONFIG_BLUEZ=y" >> $config_host_mak
   echo "BLUEZ_CFLAGS=$bluez_cflags" >> $config_host_mak
 fi
-if test "$xen" = "yes" ; then
-  echo "CONFIG_XEN=y" >> $config_host_mak
-fi
 if test "$io_thread" = "yes" ; then
   echo "CONFIG_IOTHREAD=y" >> $config_host_mak
   echo "CONFIG_THREAD=y" >> $config_host_mak
@@ -2904,6 +2900,7 @@  case "$target_arch2" in
   i386|x86_64)
     if test "$xen" = "yes" -a "$target_softmmu" = "yes" ; then
       echo "CONFIG_XEN=y" >> $config_target_mak
+      echo "LIBS+=$xen_libs" >> $config_target_mak
     fi
 esac
 case "$target_arch2" in