[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-devel] Re: [Qemu-devel] [PATCH V10 02/15] xen: Make xen build only on x86 target.



On 02/02/2011 08:49 AM, anthony.perard@xxxxxxxxxx wrote:
From: Anthony PERARD<anthony.perard@xxxxxxxxxx>

Signed-off-by: Anthony PERARD<anthony.perard@xxxxxxxxxx>
Acked-by: Alexander Graf<agraf@xxxxxxx>

Is this really necessary? The advantage to building globally is that it keeps the code from getting unnecessary i386-isms.

Regards,

Anthony Liguori

---
  Makefile.objs   |    4 ----
  Makefile.target |    4 +++-
  configure       |    5 +----
  3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Makefile.objs b/Makefile.objs
index 93406ff..d91b9bc 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -150,10 +150,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 b0ba95f..db29e96 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -206,7 +206,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

  # Inter-VM PCI shared memory
  obj-$(CONFIG_KVM) += ivshmem.o
diff --git a/configure b/configure
index 210670c..5a9121d 100755
--- a/configure
+++ b/configure
@@ -1151,7 +1151,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"
@@ -2674,9 +2673,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
@@ -3012,6 +3008,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


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.