tests: unify qemu binary paths for all qemu related tests

Our test data used a lot of different qemu binary paths and some of them were based on downstream systems. Note that there is one file where I had to add "accel=kvm" because the qemuargv2xml code parses "/usr/bin/kvm" as virt type="kvm". Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
2017-04-06 18:19:48 +02:00 · 2017-04-06 18:19:48 +02:00 · e6e26a899d
parent e9a85a6e4f
commit e6e26a899d
1685 changed files with 1689 additions and 1689 deletions
--- a/tests/capabilityschemadata/caps-qemu-kvm.xml
+++ b/tests/capabilityschemadata/caps-qemu-kvm.xml
@ -34,14 +34,14 @@
    <os_type>hvm</os_type>
    <arch name='i686'>
      <wordsize>32</wordsize>
-      <emulator>/usr/bin/qemu</emulator>
+      <emulator>/usr/bin/qemu-system-i686</emulator>
      <machine maxCpus='255'>pc-0.11</machine>
      <machine canonical='pc-0.11' maxCpus='255'>pc</machine>
      <machine maxCpus='255'>pc-0.10</machine>
      <machine maxCpus='1'>isapc</machine>
      <domain type='qemu'/>
      <domain type='kvm'>
-        <emulator>/usr/bin/qemu-kvm</emulator>
+        <emulator>/usr/bin/qemu-system-i686</emulator>
        <machine maxCpus='255'>pc-0.11</machine>
        <machine canonical='pc-0.11' maxCpus='255'>pc</machine>
        <machine maxCpus='255'>pc-0.10</machine>
@ -67,7 +67,7 @@
      <machine>isapc</machine>
      <domain type='qemu'/>
      <domain type='kvm'>
-        <emulator>/usr/bin/qemu-kvm</emulator>
+        <emulator>/usr/bin/qemu-system-x86_64</emulator>
        <machine>pc-0.11</machine>
        <machine canonical='pc-0.11'>pc</machine>
        <machine>pc-0.10</machine>
--- a/tests/capabilityschemadata/caps-test2.xml
+++ b/tests/capabilityschemadata/caps-test2.xml
@ -53,7 +53,7 @@
      <machine>isapc</machine>
      <domain type='qemu'/>
      <domain type='kvm'>
-        <emulator>/usr/libexec/qemu-kvm</emulator>
+        <emulator>/usr/bin/qemu-system-x86_64</emulator>
        <machine>pc-1.2</machine>
        <machine canonical='pc-1.2'>pc</machine>
        <machine>pc-1.1</machine>
@ -95,7 +95,7 @@
      <machine>isapc</machine>
      <domain type='qemu'/>
      <domain type='kvm'>
-        <emulator>/usr/libexec/qemu-kvm</emulator>
+        <emulator>/usr/bin/qemu-system-x86_64</emulator>
        <machine>pc-1.2</machine>
        <machine canonical='pc-1.2'>pc</machine>
        <machine>pc-1.1</machine>
--- a/tests/domainschemadata/backing-chains.xml
+++ b/tests/domainschemadata/backing-chains.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='network' device='disk'>
      <driver name='qemu' type='qcow2'/>
      <source protocol='gluster' name='Volume2/Image'>
--- a/tests/domainschemadata/default-cache-mode.xml
+++ b/tests/domainschemadata/default-cache-mode.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='file' device='disk'>
      <driver name='qemu' type='raw' cache='default'/>
      <source file='/var/lib/libvirt/images/QEMUGuest1'/>
--- a/tests/domainschemadata/domain-bios-nvram-empty.xml
+++ b/tests/domainschemadata/domain-bios-nvram-empty.xml
@ -19,7 +19,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>restart</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
    <disk type='block' device='disk'>
      <source dev='/dev/HostVG/QEMUGuest1'/>
      <target dev='hda' bus='ide'/>
--- a/tests/domainschemadata/maxMemory.xml
+++ b/tests/domainschemadata/maxMemory.xml
@ -14,6 +14,6 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
  </devices>
 </domain>
--- a/tests/domainschemadata/qemu-simple-description-title.xml
+++ b/tests/domainschemadata/qemu-simple-description-title.xml
@ -22,6 +22,6 @@
  <on_reboot>restart</on_reboot>
  <on_crash>restart</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
  </devices>
 </domain>
--- a/tests/domainschemadata/timers.xml
+++ b/tests/domainschemadata/timers.xml
@ -16,7 +16,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='block' device='disk'>
      <source dev='/dev/HostVG/QEMUGuest1'/>
      <target dev='hda' bus='ide'/>
--- a/tests/domainsnapshotxml2xmlout/disk_snapshot_redefine.xml
+++ b/tests/domainsnapshotxml2xmlout/disk_snapshot_redefine.xml
@ -39,7 +39,7 @@
    <on_reboot>restart</on_reboot>
    <on_crash>destroy</on_crash>
    <devices>
-      <emulator>/usr/bin/qemu</emulator>
+      <emulator>/usr/bin/qemu-system-i686</emulator>
      <disk type='block' device='disk'>
        <source dev='/dev/HostVG/QEMUGuest1'/>
        <target dev='hda' bus='ide'/>
--- a/tests/domainsnapshotxml2xmlout/external_vm_redefine.xml
+++ b/tests/domainsnapshotxml2xmlout/external_vm_redefine.xml
@ -29,7 +29,7 @@
    <on_reboot>restart</on_reboot>
    <on_crash>destroy</on_crash>
    <devices>
-      <emulator>/usr/bin/qemu</emulator>
+      <emulator>/usr/bin/qemu-system-i686</emulator>
      <disk type='block' device='disk' snapshot='no'>
        <source dev='/dev/HostVG/QEMUGuest1'/>
        <target dev='hda' bus='ide'/>
--- a/tests/domainsnapshotxml2xmlout/full_domain.xml
+++ b/tests/domainsnapshotxml2xmlout/full_domain.xml
@ -22,7 +22,7 @@
    <on_reboot>restart</on_reboot>
    <on_crash>destroy</on_crash>
    <devices>
-      <emulator>/usr/bin/qemu</emulator>
+      <emulator>/usr/bin/qemu-system-i686</emulator>
      <disk type='block' device='disk'>
        <source dev='/dev/HostVG/QEMUGuest1'/>
        <target dev='hda' bus='ide'/>
--- a/tests/domainsnapshotxml2xmlout/metadata.xml
+++ b/tests/domainsnapshotxml2xmlout/metadata.xml
@ -26,7 +26,7 @@
    <on_reboot>restart</on_reboot>
    <on_crash>destroy</on_crash>
    <devices>
-      <emulator>/usr/bin/qemu</emulator>
+      <emulator>/usr/bin/qemu-system-i686</emulator>
      <disk type='block' device='disk'>
        <source dev='/dev/HostVG/QEMUGuest1'/>
        <target dev='hda' bus='ide'/>
--- a/tests/genericxml2xmlindata/generic-disk-virtio.xml
+++ b/tests/genericxml2xmlindata/generic-disk-virtio.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='block' device='disk'>
      <driver name='qemu' type='raw'/>
      <source dev='/dev/HostVG/QEMUGuest1'/>
--- a/tests/genericxml2xmlindata/generic-graphics-listen-back-compat-mismatch.xml
+++ b/tests/genericxml2xmlindata/generic-graphics-listen-back-compat-mismatch.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <controller type='usb' index='0'/>
    <controller type='ide' index='0'/>
    <controller type='pci' index='0' model='pci-root'/>
--- a/tests/genericxml2xmlindata/generic-graphics-listen-back-compat.xml
+++ b/tests/genericxml2xmlindata/generic-graphics-listen-back-compat.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <controller type='usb' index='0'/>
    <controller type='ide' index='0'/>
    <controller type='pci' index='0' model='pci-root'/>
--- a/tests/genericxml2xmlindata/generic-graphics-vnc-autoport-no.xml
+++ b/tests/genericxml2xmlindata/generic-graphics-vnc-autoport-no.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <controller type='usb' index='0'/>
    <controller type='ide' index='0'/>
    <controller type='pci' index='0' model='pci-root'/>
--- a/tests/genericxml2xmlindata/generic-graphics-vnc-listen-attr-only.xml
+++ b/tests/genericxml2xmlindata/generic-graphics-vnc-listen-attr-only.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <controller type='usb' index='0'/>
    <controller type='ide' index='0'/>
    <controller type='pci' index='0' model='pci-root'/>
--- a/tests/genericxml2xmlindata/generic-graphics-vnc-listen-element-minimal.xml
+++ b/tests/genericxml2xmlindata/generic-graphics-vnc-listen-element-minimal.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <controller type='usb' index='0'/>
    <controller type='ide' index='0'/>
    <controller type='pci' index='0' model='pci-root'/>
--- a/tests/genericxml2xmlindata/generic-graphics-vnc-listen-element-with-address.xml
+++ b/tests/genericxml2xmlindata/generic-graphics-vnc-listen-element-with-address.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <controller type='usb' index='0'/>
    <controller type='ide' index='0'/>
    <controller type='pci' index='0' model='pci-root'/>
--- a/tests/genericxml2xmlindata/generic-graphics-vnc-manual-port.xml
+++ b/tests/genericxml2xmlindata/generic-graphics-vnc-manual-port.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <controller type='usb' index='0'/>
    <controller type='ide' index='0'/>
    <controller type='pci' index='0' model='pci-root'/>
--- a/tests/genericxml2xmlindata/generic-graphics-vnc-minimal.xml
+++ b/tests/genericxml2xmlindata/generic-graphics-vnc-minimal.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <controller type='usb' index='0'/>
    <controller type='ide' index='0'/>
    <controller type='pci' index='0' model='pci-root'/>
--- a/tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-address.xml
+++ b/tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-address.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <controller type='usb' index='0'/>
    <controller type='ide' index='0'/>
    <controller type='pci' index='0' model='pci-root'/>
--- a/tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-socket-mismatch.xml
+++ b/tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-socket-mismatch.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <controller type='usb' index='0'/>
    <controller type='ide' index='0'/>
    <controller type='pci' index='0' model='pci-root'/>
--- a/tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-socket.xml
+++ b/tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-socket.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <controller type='usb' index='0'/>
    <controller type='ide' index='0'/>
    <controller type='pci' index='0' model='pci-root'/>
--- a/tests/genericxml2xmlindata/generic-graphics-vnc-socket-listen.xml
+++ b/tests/genericxml2xmlindata/generic-graphics-vnc-socket-listen.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <controller type='usb' index='0'/>
    <controller type='ide' index='0'/>
    <controller type='pci' index='0' model='pci-root'/>
--- a/tests/genericxml2xmlindata/generic-graphics-vnc-socket.xml
+++ b/tests/genericxml2xmlindata/generic-graphics-vnc-socket.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <controller type='usb' index='0'/>
    <controller type='ide' index='0'/>
    <controller type='pci' index='0' model='pci-root'/>
--- a/tests/genericxml2xmloutdata/generic-disk-virtio.xml
+++ b/tests/genericxml2xmloutdata/generic-disk-virtio.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='block' device='disk'>
      <driver name='qemu' type='raw'/>
      <source dev='/dev/HostVG/QEMUGuest1'/>
--- a/tests/genericxml2xmloutdata/generic-graphics-listen-back-compat.xml
+++ b/tests/genericxml2xmloutdata/generic-graphics-listen-back-compat.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <controller type='usb' index='0'/>
    <controller type='ide' index='0'/>
    <controller type='pci' index='0' model='pci-root'/>
--- a/tests/genericxml2xmloutdata/generic-graphics-vnc-listen-attr-only.xml
+++ b/tests/genericxml2xmloutdata/generic-graphics-vnc-listen-attr-only.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <controller type='usb' index='0'/>
    <controller type='ide' index='0'/>
    <controller type='pci' index='0' model='pci-root'/>
--- a/tests/genericxml2xmloutdata/generic-graphics-vnc-listen-element-minimal.xml
+++ b/tests/genericxml2xmloutdata/generic-graphics-vnc-listen-element-minimal.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <controller type='usb' index='0'/>
    <controller type='ide' index='0'/>
    <controller type='pci' index='0' model='pci-root'/>
--- a/tests/genericxml2xmloutdata/generic-graphics-vnc-listen-element-with-address.xml
+++ b/tests/genericxml2xmloutdata/generic-graphics-vnc-listen-element-with-address.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <controller type='usb' index='0'/>
    <controller type='ide' index='0'/>
    <controller type='pci' index='0' model='pci-root'/>
--- a/tests/genericxml2xmloutdata/generic-graphics-vnc-manual-port.xml
+++ b/tests/genericxml2xmloutdata/generic-graphics-vnc-manual-port.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <controller type='usb' index='0'/>
    <controller type='ide' index='0'/>
    <controller type='pci' index='0' model='pci-root'/>
--- a/tests/genericxml2xmloutdata/generic-graphics-vnc-minimal.xml
+++ b/tests/genericxml2xmloutdata/generic-graphics-vnc-minimal.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <controller type='usb' index='0'/>
    <controller type='ide' index='0'/>
    <controller type='pci' index='0' model='pci-root'/>
--- a/tests/genericxml2xmloutdata/generic-graphics-vnc-socket-attr-listen-address.xml
+++ b/tests/genericxml2xmloutdata/generic-graphics-vnc-socket-attr-listen-address.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <controller type='usb' index='0'/>
    <controller type='ide' index='0'/>
    <controller type='pci' index='0' model='pci-root'/>
--- a/tests/genericxml2xmloutdata/generic-graphics-vnc-socket-attr-listen-socket.xml
+++ b/tests/genericxml2xmloutdata/generic-graphics-vnc-socket-attr-listen-socket.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <controller type='usb' index='0'/>
    <controller type='ide' index='0'/>
    <controller type='pci' index='0' model='pci-root'/>
--- a/tests/genericxml2xmloutdata/generic-graphics-vnc-socket-listen.xml
+++ b/tests/genericxml2xmloutdata/generic-graphics-vnc-socket-listen.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <controller type='usb' index='0'/>
    <controller type='ide' index='0'/>
    <controller type='pci' index='0' model='pci-root'/>
--- a/tests/genericxml2xmloutdata/generic-graphics-vnc-socket.xml
+++ b/tests/genericxml2xmloutdata/generic-graphics-vnc-socket.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <controller type='usb' index='0'/>
    <controller type='ide' index='0'/>
    <controller type='pci' index='0' model='pci-root'/>
--- a/tests/qemuagentdata/qemuagent-fsinfo.xml
+++ b/tests/qemuagentdata/qemuagent-fsinfo.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='file' device='disk'>
      <source file='/tmp/idedisk.img'/>
      <target dev='hdc' bus='ide'/>
--- a/tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.args
@ -4,7 +4,7 @@ HOME=/home/test \
 USER=test \
 LOGNAME=test \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
 -M pc \
--- a/tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='block' device='cdrom'>
      <driver name='qemu' type='raw'/>
      <source dev='/dev/cdrom'/>
--- a/tests/qemuargv2xmldata/qemuargv2xml-boot-floppy.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-boot-floppy.args
@ -4,7 +4,7 @@ HOME=/home/test \
 USER=test \
 LOGNAME=test \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
 -M pc \
--- a/tests/qemuargv2xmldata/qemuargv2xml-boot-floppy.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-boot-floppy.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='block' device='disk'>
      <driver name='qemu' type='raw'/>
      <source dev='/dev/HostVG/QEMUGuest1'/>
--- a/tests/qemuargv2xmldata/qemuargv2xml-boot-network.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-boot-network.args
@ -4,7 +4,7 @@ HOME=/home/test \
 USER=test \
 LOGNAME=test \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
 -M pc \
--- a/tests/qemuargv2xmldata/qemuargv2xml-boot-network.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-boot-network.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='block' device='disk'>
      <driver name='qemu' type='raw'/>
      <source dev='/dev/HostVG/QEMUGuest1'/>
--- a/tests/qemuargv2xmldata/qemuargv2xml-clock-localtime.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-clock-localtime.args
@ -4,7 +4,7 @@ HOME=/home/test \
 USER=test \
 LOGNAME=test \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
 -M pc \
--- a/tests/qemuargv2xmldata/qemuargv2xml-clock-localtime.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-clock-localtime.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='block' device='disk'>
      <driver name='qemu' type='raw'/>
      <source dev='/dev/HostVG/QEMUGuest1'/>
--- a/tests/qemuargv2xmldata/qemuargv2xml-clock-utc.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-clock-utc.args
@ -4,7 +4,7 @@ HOME=/home/test \
 USER=test \
 LOGNAME=test \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
 -M pc \
--- a/tests/qemuargv2xmldata/qemuargv2xml-clock-utc.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-clock-utc.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='block' device='disk'>
      <driver name='qemu' type='raw'/>
      <source dev='/dev/HostVG/QEMUGuest1'/>
--- a/tests/qemuargv2xmldata/qemuargv2xml-console-compat.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-console-compat.args
@ -4,7 +4,7 @@ HOME=/home/test \
 USER=test \
 LOGNAME=test \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
 -M pc \
--- a/tests/qemuargv2xmldata/qemuargv2xml-console-compat.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-console-compat.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='block' device='disk'>
      <driver name='qemu' type='raw'/>
      <source dev='/dev/HostVG/QEMUGuest1'/>
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom-empty.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom-empty.args
@ -4,7 +4,7 @@ HOME=/home/test \
 USER=test \
 LOGNAME=test \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
 -M pc \
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom-empty.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom-empty.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='block' device='disk'>
      <driver name='qemu' type='raw'/>
      <source dev='/dev/HostVG/QEMUGuest1'/>
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.args
@ -4,7 +4,7 @@ HOME=/home/test \
 USER=test \
 LOGNAME=test \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
 -M pc \
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='block' device='disk'>
      <driver name='qemu' type='raw'/>
      <source dev='/dev/HostVG/QEMUGuest1'/>
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-cdrom.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-cdrom.args
@ -4,7 +4,7 @@ HOME=/home/test \
 USER=test \
 LOGNAME=test \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
 -M pc \
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-cdrom.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-cdrom.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='block' device='disk'>
      <driver name='qemu' type='raw'/>
      <source dev='/dev/HostVG/QEMUGuest1'/>
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-disk.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-disk.args
@ -4,7 +4,7 @@ HOME=/home/test \
 USER=test \
 LOGNAME=test \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
 -M pc \
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-disk.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-disk.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='block' device='disk'>
      <driver name='qemu' type='raw'/>
      <source dev='/dev/HostVG/QEMUGuest1'/>
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-directsync.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-directsync.args
@ -4,7 +4,7 @@ HOME=/home/test \
 USER=test \
 LOGNAME=test \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
 -M pc \
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-directsync.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-directsync.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='block' device='disk'>
      <driver name='qemu' type='qcow2' cache='directsync'/>
      <source dev='/dev/HostVG/QEMUGuest1'/>
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-unsafe.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-unsafe.args
@ -4,7 +4,7 @@ HOME=/home/test \
 USER=test \
 LOGNAME=test \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
 -M pc \
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-unsafe.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-unsafe.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='block' device='disk'>
      <driver name='qemu' type='qcow2' cache='unsafe'/>
      <source dev='/dev/HostVG/QEMUGuest1'/>
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-none.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-none.args
@ -4,7 +4,7 @@ HOME=/home/test \
 USER=test \
 LOGNAME=test \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
 -M pc \
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-none.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-none.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='block' device='disk'>
      <driver name='qemu' type='qcow2' cache='none'/>
      <source dev='/dev/HostVG/QEMUGuest1'/>
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wb.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wb.args
@ -4,7 +4,7 @@ HOME=/home/test \
 USER=test \
 LOGNAME=test \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
 -M pc \
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wb.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wb.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='block' device='disk'>
      <driver name='qemu' type='qcow2' cache='writeback'/>
      <source dev='/dev/HostVG/QEMUGuest1'/>
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wt.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wt.args
@ -4,7 +4,7 @@ HOME=/home/test \
 USER=test \
 LOGNAME=test \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
 -M pc \
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wt.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wt.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='block' device='disk'>
      <driver name='qemu' type='qcow2' cache='writethrough'/>
      <source dev='/dev/HostVG/QEMUGuest1'/>
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-enospace.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-enospace.args
@ -4,7 +4,7 @@ HOME=/home/test \
 USER=test \
 LOGNAME=test \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
 -M pc \
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-enospace.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-enospace.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='block' device='disk'>
      <driver name='qemu' type='qcow2' cache='none' error_policy='enospace'/>
      <source dev='/dev/HostVG/QEMUGuest1'/>
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-stop.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-stop.args
@ -4,7 +4,7 @@ HOME=/home/test \
 USER=test \
 LOGNAME=test \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
 -M pc \
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-stop.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-stop.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='block' device='disk'>
      <driver name='qemu' type='qcow2' cache='none' error_policy='stop'/>
      <source dev='/dev/HostVG/QEMUGuest1'/>
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-wreport-rignore.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-wreport-rignore.args
@ -4,7 +4,7 @@ HOME=/home/test \
 USER=test \
 LOGNAME=test \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
 -M pc \
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-wreport-rignore.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-wreport-rignore.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='block' device='disk'>
      <driver name='qemu' type='qcow2' cache='none' error_policy='report' rerror_policy='ignore'/>
      <source dev='/dev/HostVG/QEMUGuest1'/>
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-fmt-qcow.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-fmt-qcow.args
@ -4,7 +4,7 @@ HOME=/home/test \
 USER=test \
 LOGNAME=test \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
 -M pc \
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-fmt-qcow.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-fmt-qcow.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='block' device='disk'>
      <driver name='qemu' type='qcow2'/>
      <source dev='/dev/HostVG/QEMUGuest1'/>
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.args
@ -4,7 +4,7 @@ HOME=/home/test \
 USER=test \
 LOGNAME=test \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
 -M pc \
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='network' device='disk'>
      <driver name='qemu' type='raw'/>
      <source protocol='gluster' name='Volume1/Image'>
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.args
@ -4,7 +4,7 @@ HOME=/home/test \
 USER=test \
 LOGNAME=test \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
 -M pc \
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='network' device='disk'>
      <driver name='qemu' type='raw'/>
      <auth username='myname'>
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi.args
@ -4,7 +4,7 @@ HOME=/home/test \
 USER=test \
 LOGNAME=test \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
 -M pc \
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='network' device='disk'>
      <driver name='qemu' type='raw'/>
      <source protocol='iscsi' name='iqn.1992-01.com.example'>
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-export.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-export.args
@ -4,7 +4,7 @@ HOME=/home/test \
 USER=test \
 LOGNAME=test \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
 -M pc \
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-export.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-export.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='block' device='disk'>
      <driver name='qemu' type='raw'/>
      <source dev='/dev/HostVG/QEMUGuest1'/>
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6-export.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6-export.args
@ -4,7 +4,7 @@ HOME=/home/test \
 USER=test \
 LOGNAME=test \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
 -M pc \
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6-export.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6-export.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='block' device='disk'>
      <driver name='qemu' type='raw'/>
      <source dev='/dev/HostVG/QEMUGuest1'/>
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6.args
@ -4,7 +4,7 @@ HOME=/home/test \
 USER=test \
 LOGNAME=test \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
 -M pc \
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='block' device='disk'>
      <driver name='qemu' type='raw'/>
      <source dev='/dev/HostVG/QEMUGuest1'/>
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-unix.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-unix.args
@ -4,7 +4,7 @@ HOME=/home/test \
 USER=test \
 LOGNAME=test \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
 -M pc \
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-unix.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-unix.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='block' device='disk'>
      <driver name='qemu' type='raw'/>
      <source dev='/dev/HostVG/QEMUGuest1'/>
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd.args
@ -4,7 +4,7 @@ HOME=/home/test \
 USER=test \
 LOGNAME=test \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
 -M pc \
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='block' device='disk'>
      <driver name='qemu' type='raw'/>
      <source dev='/dev/HostVG/QEMUGuest1'/>
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-auth.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-auth.args
@ -4,7 +4,7 @@ HOME=/home/test \
 USER=test \
 LOGNAME=test \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
 -M pc \
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-auth.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-auth.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='block' device='disk'>
      <driver name='qemu' type='raw'/>
      <source dev='/dev/HostVG/QEMUGuest1'/>
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ceph-env.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ceph-env.args
@ -6,7 +6,7 @@ LOGNAME=test \
 QEMU_AUDIO_DRV=none \
 CEPH_ARGS=-m \
 mon1.example.org:6321,mon2.example.org:6322,mon3.example.org:6322 \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
 -M pc \
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ceph-env.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ceph-env.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='block' device='disk'>
      <driver name='qemu' type='raw'/>
      <source dev='/dev/HostVG/QEMUGuest1'/>
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ipv6.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ipv6.args
@ -4,7 +4,7 @@ HOME=/home/test \
 USER=test \
 LOGNAME=test \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
 -M pc \
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ipv6.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ipv6.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='block' device='disk'>
      <driver name='qemu' type='raw'/>
      <source dev='/dev/HostVG/QEMUGuest1'/>
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd.args
@ -4,7 +4,7 @@ HOME=/home/test \
 USER=test \
 LOGNAME=test \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
 -name QEMUGuest1 \
 -S \
 -M pc \
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd.xml
@ -13,7 +13,7 @@
  <on_reboot>restart</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
-    <emulator>/usr/bin/qemu</emulator>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
    <disk type='block' device='disk'>
      <driver name='qemu' type='raw'/>
      <source dev='/dev/HostVG/QEMUGuest1'/>
--- a/Show More
+++ b/Show More