From 20fd81147df3796000bc242a0c515f67713fdbdd Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 11 Feb 2013 13:20:37 +0000
Subject: [PATCH] test-tool: On i386, upstream qemu program is now called
 'qemu-system-i386'.

For a while, the upstream qemu i386 emulator has been called
'qemu-system-i386' (instead of just 'qemu').  Fix test-tool so it
calls the right program.
---
 test-tool/test-tool.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/test-tool/test-tool.c b/test-tool/test-tool.c
index 63f92b5bb..73f7f2f44 100644
--- a/test-tool/test-tool.c
+++ b/test-tool/test-tool.c
@@ -378,19 +378,11 @@ set_qemu (guestfs_h *g, const char *path, int use_wrapper)
   fp = fdopen (fd, "w");
   fprintf (fp,
            "#!/bin/sh -\n"
+           "host_cpu=%s\n"
            "qemudir='%s'\n"
-           "\"$qemudir\"/",
-           path);
-
-  /* Select the right qemu binary for the wrapper script. */
-#ifdef __i386__
-  fprintf (fp, "i386-softmmu/qemu");
-#else
-  fprintf (fp, host_cpu "-softmmu/qemu-system-" host_cpu);
-#endif
-
-  fprintf (fp, " -L \"$qemudir\"/pc-bios \"$@\"\n");
-
+           "qemu=\"$qemudir/$host_cpu-softmmu/qemu-system-$host_cpu\"\n"
+           "\"$qemu\" -L \"$qemudir/pc-bios\" \"$@\"\n",
+           host_cpu, path);
   fclose (fp);
 
   guestfs_set_qemu (g, qemuwrapper);