From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=57945 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PNqfF-0001ad-AB for qemu-devel@nongnu.org; Wed, 01 Dec 2010 12:40:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PNqfE-0002SW-99 for qemu-devel@nongnu.org; Wed, 01 Dec 2010 12:40:21 -0500 Received: from smtp02.citrix.com ([66.165.176.63]:17959) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PNqfE-0002SI-3H for qemu-devel@nongnu.org; Wed, 01 Dec 2010 12:40:20 -0500 From: anthony.perard@citrix.com Date: Wed, 1 Dec 2010 17:39:34 +0000 Message-Id: <1291225188-9972-3-git-send-email-anthony.perard@citrix.com> In-Reply-To: <1291225188-9972-1-git-send-email-anthony.perard@citrix.com> References: <1291225188-9972-1-git-send-email-anthony.perard@citrix.com> Subject: [Qemu-devel] [PATCH V8 02/16] xen: Make xen build only on x86 target. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU-devel Cc: Anthony PERARD , Xen Devel , Stefano Stabellini From: Anthony PERARD Signed-off-by: Anthony PERARD --- Makefile.objs | 4 ---- Makefile.target | 4 +++- configure | 5 +---- 3 files changed, 4 insertions(+), 9 deletions(-) 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 -- 1.7.1