From: Doug Goldstein <cardoe@cardoe.com>
Date: Tue, 25 Aug 2015 13:49:49 +0000 (+0000)
Subject: build: use correct qemu emulator binary
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~2613
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=07e43fa0b973f7a4cb4b590294b36035607146c4;p=xen.git

build: use correct qemu emulator binary

Per http://wiki.qemu.org/ChangeLog/1.0 and the fact that no currently
supported distro ships the x86 system emulator binary as 'qemu', this
changes the default when a user specifies --with-system-qemu without a
PATH to 'qemu-system-i386', otherwise the default results in a
non-functional setup.

[ Reran autogen.sh -iwj ]

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
---

diff --git a/tools/configure b/tools/configure
index 1098f1f686..428b3a5ac8 100755
--- a/tools/configure
+++ b/tools/configure
@@ -4265,7 +4265,7 @@ if test "${with_system_qemu+set}" = set; then :
   withval=$with_system_qemu;
     case $withval in
         yes)
-            qemu_xen=n ; qemu_xen_path="qemu"
+            qemu_xen=n ; qemu_xen_path="qemu-system-i386"
             qemu_xen_systemd="/usr/bin/env $qemu_xen_path" ;;
         no)
             qemu_xen=y ;;
diff --git a/tools/configure.ac b/tools/configure.ac
index c1fa65828f..7daec99b6b 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -177,7 +177,7 @@ AC_ARG_WITH([system-qemu],
         device model instead of building and installing our own version]),[
     case $withval in
         yes)
-            qemu_xen=n ; qemu_xen_path="qemu"
+            qemu_xen=n ; qemu_xen_path="qemu-system-i386"
             qemu_xen_systemd="/usr/bin/env $qemu_xen_path" ;;
         no)
             qemu_xen=y ;;