tests: fix name of 32-bit x86 QEMU binary

The 32-bit x86 binary is called qemu-system-i386, not
qemu-system-i686. This mistake across many test XML files was
not noticed because the mistake was also made in testutilsqemu.c
when mocking the capabilities.

Reviewed-by: Erik Skultety <eskultet@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/tests/capabilityschemadata/caps-qemu-kvm.xml b/tests/capabilityschemadata/caps-qemu-kvm.xml
index 4b3895dbd1fee2e018c82d1401488abb005a8e0a..65c3bba7c4b114121210d5fb727aa90a97506cf0 100644 (file)
--- a/tests/capabilityschemadata/caps-qemu-kvm.xml
+++ b/tests/capabilityschemadata/caps-qemu-kvm.xml
@@ -35,14 +35,14 @@
     <os_type>hvm</os_type>
     <arch name='i686'>
       <wordsize>32</wordsize>
-      <emulator>/usr/bin/qemu-system-i686</emulator>
+      <emulator>/usr/bin/qemu-system-i386</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-system-i686</emulator>
+        <emulator>/usr/bin/qemu-system-i386</emulator>
         <machine maxCpus='255'>pc-0.11</machine>
         <machine canonical='pc-0.11' maxCpus='255'>pc</machine>
         <machine maxCpus='255'>pc-0.10</machine>

diff --git a/tests/domainschemadata/backing-chains.xml b/tests/domainschemadata/backing-chains.xml
index 7fd3013474a97f8fa53bf2ee9d6d78b2676cc3c0..908eba5c1aff128bace7b74d7e8fba5c5b371273 100644 (file)
--- 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-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='network' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source protocol='gluster' name='Volume2/Image'>

diff --git a/tests/domainschemadata/default-cache-mode.xml b/tests/domainschemadata/default-cache-mode.xml
index b5d2ed867326909cd28ec504f6839e4bd8a93708..a11232316da7cec336e186ba7d3c1faf2aad65b2 100644 (file)
--- 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-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw' cache='default'/>
       <source file='/var/lib/libvirt/images/QEMUGuest1'/>

diff --git a/tests/domainschemadata/maxMemory.xml b/tests/domainschemadata/maxMemory.xml
index f1562f591ee83a7c2c560e081a5ad306e0754fb5..366442999c461406db5b1164efd63dd0cfabbce2 100644 (file)
--- 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-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
   </devices>
 </domain>

diff --git a/tests/domainschemadata/timers.xml b/tests/domainschemadata/timers.xml
index 8af431a80789ed004c2a2347fd2ee701af2e7644..75131bd7c1addd1c5db24b085595aea9ba7afac5 100644 (file)
--- 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-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/genericxml2xmlindata/cachetune-cdp.xml b/tests/genericxml2xmlindata/cachetune-cdp.xml
index 9f4c13906efa619306b1cb9845f02180c258070e..10ab8a9f923e8ba04c37c2bb6b0ae550e627bc4c 100644 (file)
--- a/tests/genericxml2xmlindata/cachetune-cdp.xml
+++ b/tests/genericxml2xmlindata/cachetune-cdp.xml
@@ -28,7 +28,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmlindata/cachetune-colliding-allocs.xml b/tests/genericxml2xmlindata/cachetune-colliding-allocs.xml
index 82c9176cbafaf4009381628d459db10ac32d7f3c..108d401a63f81182ccec94ecec86a9c6de1f7344 100644 (file)
--- a/tests/genericxml2xmlindata/cachetune-colliding-allocs.xml
+++ b/tests/genericxml2xmlindata/cachetune-colliding-allocs.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmlindata/cachetune-colliding-monitor.xml b/tests/genericxml2xmlindata/cachetune-colliding-monitor.xml
index d481fb55c067c7221bff84c93dda3e76ff9abe5a..a8a6ee272f2ff09b056d469cb900581aac4de3e3 100644 (file)
--- a/tests/genericxml2xmlindata/cachetune-colliding-monitor.xml
+++ b/tests/genericxml2xmlindata/cachetune-colliding-monitor.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmlindata/cachetune-colliding-tunes.xml b/tests/genericxml2xmlindata/cachetune-colliding-tunes.xml
index a0f37028c98cbeebd7b2a57ddfe1f83da9ad1e42..73ba041815dff26eb89ea41a94ae42b23d2379b5 100644 (file)
--- a/tests/genericxml2xmlindata/cachetune-colliding-tunes.xml
+++ b/tests/genericxml2xmlindata/cachetune-colliding-tunes.xml
@@ -21,7 +21,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmlindata/cachetune-colliding-types.xml b/tests/genericxml2xmlindata/cachetune-colliding-types.xml
index c229eccee4b6ad431bdb0aa173cf02941bf08ea7..5ce92746939a552d3e83b78ba26e506bf7b577cf 100644 (file)
--- a/tests/genericxml2xmlindata/cachetune-colliding-types.xml
+++ b/tests/genericxml2xmlindata/cachetune-colliding-types.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmlindata/cachetune-extra-tunes.xml b/tests/genericxml2xmlindata/cachetune-extra-tunes.xml
index d3b01a8ecdbf65e11b1359c42bbecd2fb7db9668..07ef3727498ece948a7b8833126f0e6af2eb8e3f 100644 (file)
--- a/tests/genericxml2xmlindata/cachetune-extra-tunes.xml
+++ b/tests/genericxml2xmlindata/cachetune-extra-tunes.xml
@@ -22,7 +22,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmlindata/cachetune-small.xml b/tests/genericxml2xmlindata/cachetune-small.xml
index 748be086c3fd045e5fd265e835ea3dee3a2e7f73..ac511d3a1991107e884c039d077ff457ea2e20db 100644 (file)
--- a/tests/genericxml2xmlindata/cachetune-small.xml
+++ b/tests/genericxml2xmlindata/cachetune-small.xml
@@ -25,7 +25,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmlindata/cachetune.xml b/tests/genericxml2xmlindata/cachetune.xml
index 645cab7771cf1214aac195662bccef360ac3ca85..8f9d19b4de376eed0cb1f8378787e5e88a596f47 100644 (file)
--- a/tests/genericxml2xmlindata/cachetune.xml
+++ b/tests/genericxml2xmlindata/cachetune.xml
@@ -22,7 +22,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmlindata/chardev-reconnect-invalid-mode.xml b/tests/genericxml2xmlindata/chardev-reconnect-invalid-mode.xml
index 3fce6c4d37b017eb933735878f0e4c22326e9517..a76e640e023ba316d1bb375da8b6fd5b9f78360f 100644 (file)
--- a/tests/genericxml2xmlindata/chardev-reconnect-invalid-mode.xml
+++ b/tests/genericxml2xmlindata/chardev-reconnect-invalid-mode.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='virtio-serial' index='0'/>
     <channel type='tcp'>
       <source mode='bind' host='localhost' service='5678'>

diff --git a/tests/genericxml2xmlindata/chardev-reconnect-missing-timeout.xml b/tests/genericxml2xmlindata/chardev-reconnect-missing-timeout.xml
index 010dc6cc80f7ce14b036f9daace1859a2e9b5b95..d24033057b6c08c0a2227d5146f9a119d1ffa748 100644 (file)
--- a/tests/genericxml2xmlindata/chardev-reconnect-missing-timeout.xml
+++ b/tests/genericxml2xmlindata/chardev-reconnect-missing-timeout.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='virtio-serial' index='0'/>
     <channel type='tcp'>
       <source mode='connect' host='localhost' service='5678'>

diff --git a/tests/genericxml2xmlindata/chardev-reconnect.xml b/tests/genericxml2xmlindata/chardev-reconnect.xml
index 1bd69ecc736817624d59138edf53ffa12aa0228c..f72c0e3fde896ff51ec27e0e30d6db8e17f1ea5e 100644 (file)
--- a/tests/genericxml2xmlindata/chardev-reconnect.xml
+++ b/tests/genericxml2xmlindata/chardev-reconnect.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='virtio-serial' index='0'/>
     <channel type='tcp'>
       <source mode='connect' host='localhost' service='5678'>

diff --git a/tests/genericxml2xmlindata/chardev-tcp-missing-host.xml b/tests/genericxml2xmlindata/chardev-tcp-missing-host.xml
index 523c34f29b83ea12c5acdb101476dcc78fd28fec..80604cae5dbb1c837f6fb231019030d6f260be06 100644 (file)
--- a/tests/genericxml2xmlindata/chardev-tcp-missing-host.xml
+++ b/tests/genericxml2xmlindata/chardev-tcp-missing-host.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='virtio-serial' index='0'/>
     <channel type='tcp'>
       <source mode='bind' service='5678'/>

diff --git a/tests/genericxml2xmlindata/chardev-tcp-missing-service.xml b/tests/genericxml2xmlindata/chardev-tcp-missing-service.xml
index 880f07436aeef916575e01accf9813e757d31eb1..83f487ef770bf951381eae1d74701b94c2fea096 100644 (file)
--- a/tests/genericxml2xmlindata/chardev-tcp-missing-service.xml
+++ b/tests/genericxml2xmlindata/chardev-tcp-missing-service.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='virtio-serial' index='0'/>
     <channel type='tcp'>
       <source mode='bind' host='localhost'/>

diff --git a/tests/genericxml2xmlindata/chardev-tcp-multiple-source.xml b/tests/genericxml2xmlindata/chardev-tcp-multiple-source.xml
index bb8592aa4f46d6c3e88f4e45fa65fb790e364d2c..14782f5b787fe9916e3e80886256fe657a2ccda8 100644 (file)
--- a/tests/genericxml2xmlindata/chardev-tcp-multiple-source.xml
+++ b/tests/genericxml2xmlindata/chardev-tcp-multiple-source.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='virtio-serial' index='0'/>
     <channel type='tcp'>
       <source mode='bind' host='localhost' service='5678'/>

diff --git a/tests/genericxml2xmlindata/chardev-tcp.xml b/tests/genericxml2xmlindata/chardev-tcp.xml
index e59c572a123c547b026e5d7c602a92a7d8f3f94d..c48da37ba8ee204e11b8590b4fdc05558572c957 100644 (file)
--- a/tests/genericxml2xmlindata/chardev-tcp.xml
+++ b/tests/genericxml2xmlindata/chardev-tcp.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='virtio-serial' index='0'/>
     <channel type='tcp'>
       <source host='localhost' service='5678'/>

diff --git a/tests/genericxml2xmlindata/chardev-udp-missing-connect-service.xml b/tests/genericxml2xmlindata/chardev-udp-missing-connect-service.xml
index c7ed52b4575cd2360d97ed9be9bb435689987b4d..cff4b4526fbd43683d11315d61a7edc2419bdf87 100644 (file)
--- a/tests/genericxml2xmlindata/chardev-udp-missing-connect-service.xml
+++ b/tests/genericxml2xmlindata/chardev-udp-missing-connect-service.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='virtio-serial' index='0'/>
     <channel type='udp'>
       <source mode='connect' host='localhost'/>

diff --git a/tests/genericxml2xmlindata/chardev-udp-multiple-source.xml b/tests/genericxml2xmlindata/chardev-udp-multiple-source.xml
index 2b87a1bfaa6eb93368a7db7abbbdc7fb3e56cb6b..b918b1980d606119a1598d195a5c66a925c99f2d 100644 (file)
--- a/tests/genericxml2xmlindata/chardev-udp-multiple-source.xml
+++ b/tests/genericxml2xmlindata/chardev-udp-multiple-source.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='virtio-serial' index='0'/>
     <channel type='udp'>
       <source mode='connect' host='localhost' service='5678'/>

diff --git a/tests/genericxml2xmlindata/chardev-udp.xml b/tests/genericxml2xmlindata/chardev-udp.xml
index 34441ae68e411f9c21f4d18c6204992d5f1c0fb9..75437d58715186562694019b44ed5d8679904f5f 100644 (file)
--- a/tests/genericxml2xmlindata/chardev-udp.xml
+++ b/tests/genericxml2xmlindata/chardev-udp.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='virtio-serial' index='0'/>
     <channel type='udp'>
       <source service='5678'/>

diff --git a/tests/genericxml2xmlindata/chardev-unix-redirdev-missing-path.xml b/tests/genericxml2xmlindata/chardev-unix-redirdev-missing-path.xml
index f0d6f3d60ae85ac01dae833de12a6c30b6cd7a8a..223f6353840cbecba655e93dcef4c0643598cd88 100644 (file)
--- a/tests/genericxml2xmlindata/chardev-unix-redirdev-missing-path.xml
+++ b/tests/genericxml2xmlindata/chardev-unix-redirdev-missing-path.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='virtio-serial' index='0'/>
     <controller type='usb'/>
     <redirdev bus='usb' type='unix'>

diff --git a/tests/genericxml2xmlindata/chardev-unix-rng-missing-path.xml b/tests/genericxml2xmlindata/chardev-unix-rng-missing-path.xml
index fb45c044f84bcd0a758c2153712e9f97544f9f6e..4519cf24c4bf4215442fa98ec68d4646f9d6172c 100644 (file)
--- a/tests/genericxml2xmlindata/chardev-unix-rng-missing-path.xml
+++ b/tests/genericxml2xmlindata/chardev-unix-rng-missing-path.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='virtio-serial' index='0'/>
     <memballoon model='none'/>
     <rng model='virtio'>

diff --git a/tests/genericxml2xmlindata/chardev-unix-smartcard-missing-path.xml b/tests/genericxml2xmlindata/chardev-unix-smartcard-missing-path.xml
index 451c8aa660e8e42ab28f17a52772629af3858598..9faad813027e007aaea9c2fae7df8fa3f9e3450a 100644 (file)
--- a/tests/genericxml2xmlindata/chardev-unix-smartcard-missing-path.xml
+++ b/tests/genericxml2xmlindata/chardev-unix-smartcard-missing-path.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='virtio-serial' index='0'/>
     <smartcard mode='passthrough' type='unix'>
       <source mode='connect'/>

diff --git a/tests/genericxml2xmlindata/chardev-unix.xml b/tests/genericxml2xmlindata/chardev-unix.xml
index bc715a3ae844fb4c753f583df9a6f4f33259b800..ab93498b81b931baab082e95371c26e68f05f1e8 100644 (file)
--- a/tests/genericxml2xmlindata/chardev-unix.xml
+++ b/tests/genericxml2xmlindata/chardev-unix.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='virtio-serial' index='0'/>
     <controller type='usb'/>
     <smartcard mode='passthrough' type='unix'>

diff --git a/tests/genericxml2xmlindata/disk-network-http.xml b/tests/genericxml2xmlindata/disk-network-http.xml
index ec4520c7b24ac1c9bad4d475ddd5b0cdbd5587cc..fde1222fd09849bebd6a288f790ecf122029dae6 100644 (file)
--- a/tests/genericxml2xmlindata/disk-network-http.xml
+++ b/tests/genericxml2xmlindata/disk-network-http.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
       <source protocol='http' name='test.img'>

diff --git a/tests/genericxml2xmlindata/disk-virtio.xml b/tests/genericxml2xmlindata/disk-virtio.xml
index 5731465a541621668401d62710476c354b763c3e..75fcd153b4f4119353926e72e321ce2e05ee9154 100644 (file)
--- a/tests/genericxml2xmlindata/disk-virtio.xml
+++ b/tests/genericxml2xmlindata/disk-virtio.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/genericxml2xmlindata/graphics-listen-back-compat-mismatch.xml b/tests/genericxml2xmlindata/graphics-listen-back-compat-mismatch.xml
index 31589f6a49f3a87c31222b657d5bb698d897bde5..9b598d329b974253f23c65f12d71aaf0d5c6463b 100644 (file)
--- a/tests/genericxml2xmlindata/graphics-listen-back-compat-mismatch.xml
+++ b/tests/genericxml2xmlindata/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-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmlindata/graphics-listen-back-compat.xml b/tests/genericxml2xmlindata/graphics-listen-back-compat.xml
index 2b90bc4af4be4daa05fd694f0078ac1304bbdde0..15d21148b89d191f0f122623d97f6747a7a8868d 100644 (file)
--- a/tests/genericxml2xmlindata/graphics-listen-back-compat.xml
+++ b/tests/genericxml2xmlindata/graphics-listen-back-compat.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmlindata/graphics-vnc-autoport-no.xml b/tests/genericxml2xmlindata/graphics-vnc-autoport-no.xml
index c4641d9d9a20179f81b2653dccc8346578bf2e5c..0f9b475cd0458275765184c2dbecf35c4409beb0 100644 (file)
--- a/tests/genericxml2xmlindata/graphics-vnc-autoport-no.xml
+++ b/tests/genericxml2xmlindata/graphics-vnc-autoport-no.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmlindata/graphics-vnc-listen-attr-only.xml b/tests/genericxml2xmlindata/graphics-vnc-listen-attr-only.xml
index 72f805e33a0a2571d824a51fe8c5fa16e3aed304..958bc1f45bb917ad1aaccfc3a02e7da487a4cfec 100644 (file)
--- a/tests/genericxml2xmlindata/graphics-vnc-listen-attr-only.xml
+++ b/tests/genericxml2xmlindata/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-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmlindata/graphics-vnc-listen-element-minimal.xml b/tests/genericxml2xmlindata/graphics-vnc-listen-element-minimal.xml
index 2a4855e8e17eef287f15e77576eae07de39075ce..d6823d2079cb2a5ce95292f3c78b6a684739e239 100644 (file)
--- a/tests/genericxml2xmlindata/graphics-vnc-listen-element-minimal.xml
+++ b/tests/genericxml2xmlindata/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-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmlindata/graphics-vnc-listen-element-with-address.xml b/tests/genericxml2xmlindata/graphics-vnc-listen-element-with-address.xml
index 2a4855e8e17eef287f15e77576eae07de39075ce..d6823d2079cb2a5ce95292f3c78b6a684739e239 100644 (file)
--- a/tests/genericxml2xmlindata/graphics-vnc-listen-element-with-address.xml
+++ b/tests/genericxml2xmlindata/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-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmlindata/graphics-vnc-manual-port.xml b/tests/genericxml2xmlindata/graphics-vnc-manual-port.xml
index a7514baff9fc542e7c168af9a9792c671a8d5407..b6411044f5b4a0f82e0e41fba67c3ad115ce4135 100644 (file)
--- a/tests/genericxml2xmlindata/graphics-vnc-manual-port.xml
+++ b/tests/genericxml2xmlindata/graphics-vnc-manual-port.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmlindata/graphics-vnc-minimal.xml b/tests/genericxml2xmlindata/graphics-vnc-minimal.xml
index 6b9abf9855d9465bd1144eb8adb601bc17b6cb6b..14094a8f9ca7313c90e8cb850b66d478871ae5a7 100644 (file)
--- a/tests/genericxml2xmlindata/graphics-vnc-minimal.xml
+++ b/tests/genericxml2xmlindata/graphics-vnc-minimal.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-address.xml b/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-address.xml
index 50e2d13bf11881a73d27d7c0dc54b2b0cd0cea99..8f3af8b99681d3d73dc0238b7b1ef2553cfac532 100644 (file)
--- a/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-address.xml
+++ b/tests/genericxml2xmlindata/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-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-socket-mismatch.xml b/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-socket-mismatch.xml
index f56d65c398d812c388c222a20a477b9b500a443f..18d829f209a86e31a908b74f78fedcf22f094161 100644 (file)
--- a/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-socket-mismatch.xml
+++ b/tests/genericxml2xmlindata/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-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-socket.xml b/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-socket.xml
index ab1c68bcbb1a52085bc5a7f36a6b3f84ffd9636f..d9154558a9e0ee50d149c64ed40ba1827278c69b 100644 (file)
--- a/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-socket.xml
+++ b/tests/genericxml2xmlindata/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-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmlindata/graphics-vnc-socket-listen.xml b/tests/genericxml2xmlindata/graphics-vnc-socket-listen.xml
index 9e316b09de879fb1469a0dab7d47aa5a53460e26..49d7d6563299004969feb44243bc7943888436f5 100644 (file)
--- a/tests/genericxml2xmlindata/graphics-vnc-socket-listen.xml
+++ b/tests/genericxml2xmlindata/graphics-vnc-socket-listen.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmlindata/graphics-vnc-socket.xml b/tests/genericxml2xmlindata/graphics-vnc-socket.xml
index 57fd1220d84543b37875b1ae9c8e4ac2e8c46e45..5dc57ec252128012670bc620793132e3ca65141f 100644 (file)
--- a/tests/genericxml2xmlindata/graphics-vnc-socket.xml
+++ b/tests/genericxml2xmlindata/graphics-vnc-socket.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmlindata/memorytune-colliding-allocs.xml b/tests/genericxml2xmlindata/memorytune-colliding-allocs.xml
index 9b8ebaa08475fae51aa5e26299bf8b475daa7bd5..bd42de5f1c2e1a478194cc2155437a5695f920dc 100644 (file)
--- a/tests/genericxml2xmlindata/memorytune-colliding-allocs.xml
+++ b/tests/genericxml2xmlindata/memorytune-colliding-allocs.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmlindata/memorytune-colliding-cachetune.xml b/tests/genericxml2xmlindata/memorytune-colliding-cachetune.xml
index 5416870de2c5449480c35a80bfcc18ef08d037a8..db2c1f6c567656a584b48778532762f8e906d532 100644 (file)
--- a/tests/genericxml2xmlindata/memorytune-colliding-cachetune.xml
+++ b/tests/genericxml2xmlindata/memorytune-colliding-cachetune.xml
@@ -21,7 +21,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmlindata/memorytune.xml b/tests/genericxml2xmlindata/memorytune.xml
index 7486b542c568208d3ee53d4303cec5a8d467d532..187409e525ea0209ca6746261c19deb69bb145e2 100644 (file)
--- a/tests/genericxml2xmlindata/memorytune.xml
+++ b/tests/genericxml2xmlindata/memorytune.xml
@@ -26,7 +26,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmloutdata/cachetune-extra-tunes.xml b/tests/genericxml2xmloutdata/cachetune-extra-tunes.xml
index db85af08da25cef579b422daf479ab19706c1cfd..6992197d2d24588ac129c9f0246e06c43c239f38 100644 (file)
--- a/tests/genericxml2xmloutdata/cachetune-extra-tunes.xml
+++ b/tests/genericxml2xmloutdata/cachetune-extra-tunes.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmloutdata/chardev-reconnect.xml b/tests/genericxml2xmloutdata/chardev-reconnect.xml
index d0e2cd23da6aff57974c1675729368df6e249f47..0a521249a84d8c8b9388529083189767509f9ba7 100644 (file)
--- a/tests/genericxml2xmloutdata/chardev-reconnect.xml
+++ b/tests/genericxml2xmloutdata/chardev-reconnect.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='virtio-serial' index='0'/>
     <channel type='tcp'>
       <source mode='connect' host='localhost' service='5678'>

diff --git a/tests/genericxml2xmloutdata/chardev-tcp.xml b/tests/genericxml2xmloutdata/chardev-tcp.xml
index ef217c0abb0b186ac8960d46d49e2d26d430adf6..a1aadf0dc837b2b97dbb8abdb7562115c74c60c7 100644 (file)
--- a/tests/genericxml2xmloutdata/chardev-tcp.xml
+++ b/tests/genericxml2xmloutdata/chardev-tcp.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='virtio-serial' index='0'/>
     <channel type='tcp'>
       <source mode='connect' host='localhost' service='5678'/>

diff --git a/tests/genericxml2xmloutdata/chardev-udp.xml b/tests/genericxml2xmloutdata/chardev-udp.xml
index c9b3e5550c1ebbe16925e0febfdfd1bd1d8faf50..fc9a5c0b456493a9c2585302f023a31d775ecff0 100644 (file)
--- a/tests/genericxml2xmloutdata/chardev-udp.xml
+++ b/tests/genericxml2xmloutdata/chardev-udp.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='virtio-serial' index='0'/>
     <channel type='udp'>
       <source mode='connect' service='5678'/>

diff --git a/tests/genericxml2xmloutdata/chardev-unix.xml b/tests/genericxml2xmloutdata/chardev-unix.xml
index c797cbff8abbe5ad940d45a5aaedc8d99611e067..7af2237441fcc16eec8f71898541baf23c0ba88e 100644 (file)
--- a/tests/genericxml2xmloutdata/chardev-unix.xml
+++ b/tests/genericxml2xmloutdata/chardev-unix.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='virtio-serial' index='0'/>
     <controller type='usb' index='0'/>
     <controller type='ccid' index='0'/>

diff --git a/tests/genericxml2xmloutdata/disk-virtio.xml b/tests/genericxml2xmloutdata/disk-virtio.xml
index 5731465a541621668401d62710476c354b763c3e..75fcd153b4f4119353926e72e321ce2e05ee9154 100644 (file)
--- a/tests/genericxml2xmloutdata/disk-virtio.xml
+++ b/tests/genericxml2xmloutdata/disk-virtio.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/genericxml2xmloutdata/graphics-listen-back-compat.xml b/tests/genericxml2xmloutdata/graphics-listen-back-compat.xml
index 5dfffae3bbe96a026471fe46e76be9f9ea7176ec..91fa2e7eea6057e392bac17bd0e9483a9378721c 100644 (file)
--- a/tests/genericxml2xmloutdata/graphics-listen-back-compat.xml
+++ b/tests/genericxml2xmloutdata/graphics-listen-back-compat.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmloutdata/graphics-vnc-listen-attr-only.xml b/tests/genericxml2xmloutdata/graphics-vnc-listen-attr-only.xml
index 3d0c035434ebb90c5113fe1d2ec887f48a0b08e7..dcf8659eb3417fdd0d170603d94063ed42a8c835 100644 (file)
--- a/tests/genericxml2xmloutdata/graphics-vnc-listen-attr-only.xml
+++ b/tests/genericxml2xmloutdata/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-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmloutdata/graphics-vnc-listen-element-minimal.xml b/tests/genericxml2xmloutdata/graphics-vnc-listen-element-minimal.xml
index 3d0c035434ebb90c5113fe1d2ec887f48a0b08e7..dcf8659eb3417fdd0d170603d94063ed42a8c835 100644 (file)
--- a/tests/genericxml2xmloutdata/graphics-vnc-listen-element-minimal.xml
+++ b/tests/genericxml2xmloutdata/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-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmloutdata/graphics-vnc-listen-element-with-address.xml b/tests/genericxml2xmloutdata/graphics-vnc-listen-element-with-address.xml
index 3d0c035434ebb90c5113fe1d2ec887f48a0b08e7..dcf8659eb3417fdd0d170603d94063ed42a8c835 100644 (file)
--- a/tests/genericxml2xmloutdata/graphics-vnc-listen-element-with-address.xml
+++ b/tests/genericxml2xmloutdata/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-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmloutdata/graphics-vnc-manual-port.xml b/tests/genericxml2xmloutdata/graphics-vnc-manual-port.xml
index b18d8eb82854f90519bca937e5db1166e03a45a6..a969d92372c64002eb4f41969ae2bbbf4dcb06b8 100644 (file)
--- a/tests/genericxml2xmloutdata/graphics-vnc-manual-port.xml
+++ b/tests/genericxml2xmloutdata/graphics-vnc-manual-port.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmloutdata/graphics-vnc-minimal.xml b/tests/genericxml2xmloutdata/graphics-vnc-minimal.xml
index b18d8eb82854f90519bca937e5db1166e03a45a6..a969d92372c64002eb4f41969ae2bbbf4dcb06b8 100644 (file)
--- a/tests/genericxml2xmloutdata/graphics-vnc-minimal.xml
+++ b/tests/genericxml2xmloutdata/graphics-vnc-minimal.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmloutdata/graphics-vnc-socket-attr-listen-address.xml b/tests/genericxml2xmloutdata/graphics-vnc-socket-attr-listen-address.xml
index aa2314a2279fdffa32302baaaf07c993ec04010e..7ccd280e71e2d9dc458ab7d19f6de8bc0b3cfb7d 100644 (file)
--- a/tests/genericxml2xmloutdata/graphics-vnc-socket-attr-listen-address.xml
+++ b/tests/genericxml2xmloutdata/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-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmloutdata/graphics-vnc-socket-attr-listen-socket.xml b/tests/genericxml2xmloutdata/graphics-vnc-socket-attr-listen-socket.xml
index aa2314a2279fdffa32302baaaf07c993ec04010e..7ccd280e71e2d9dc458ab7d19f6de8bc0b3cfb7d 100644 (file)
--- a/tests/genericxml2xmloutdata/graphics-vnc-socket-attr-listen-socket.xml
+++ b/tests/genericxml2xmloutdata/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-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmloutdata/graphics-vnc-socket-listen.xml b/tests/genericxml2xmloutdata/graphics-vnc-socket-listen.xml
index bdcdfdc7cf42c9f0d794f575be3a958bd986f882..897d9e448a6bde572124fa076f4f9370b637ed61 100644 (file)
--- a/tests/genericxml2xmloutdata/graphics-vnc-socket-listen.xml
+++ b/tests/genericxml2xmloutdata/graphics-vnc-socket-listen.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/genericxml2xmloutdata/graphics-vnc-socket.xml b/tests/genericxml2xmloutdata/graphics-vnc-socket.xml
index bdcdfdc7cf42c9f0d794f575be3a958bd986f882..897d9e448a6bde572124fa076f4f9370b637ed61 100644 (file)
--- a/tests/genericxml2xmloutdata/graphics-vnc-socket.xml
+++ b/tests/genericxml2xmloutdata/graphics-vnc-socket.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/qemuagentdata/fsinfo.xml b/tests/qemuagentdata/fsinfo.xml
index d27d627b57c24992e1a83916cb4ed754a8fad838..233968fc29e1e9bb412c3c53004a3f6f09b2874f 100644 (file)
--- a/tests/qemuagentdata/fsinfo.xml
+++ b/tests/qemuagentdata/fsinfo.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <source file='/tmp/idedisk.img'/>
       <target dev='hdc' bus='ide'/>

diff --git a/tests/qemudomaincheckpointxml2xmlout/internal-active-invalid.xml b/tests/qemudomaincheckpointxml2xmlout/internal-active-invalid.xml
index a518c5891519b7068de545cf21ccfb08c39377c5..2b6d8298c2b399eb4f772198cb4e38f66e0cb01e 100644 (file)
--- a/tests/qemudomaincheckpointxml2xmlout/internal-active-invalid.xml
+++ b/tests/qemudomaincheckpointxml2xmlout/internal-active-invalid.xml
@@ -24,7 +24,7 @@
     <on_reboot>restart</on_reboot>
     <on_crash>destroy</on_crash>
     <devices>
-      <emulator>/usr/bin/qemu-system-i686</emulator>
+      <emulator>/usr/bin/qemu-system-i386</emulator>
       <disk type='file' device='disk'>
         <driver name='qemu' type='qcow2'/>
         <source file='/tmp/data.img'/>

diff --git a/tests/qemudomaincheckpointxml2xmlout/internal-inactive-invalid.xml b/tests/qemudomaincheckpointxml2xmlout/internal-inactive-invalid.xml
index df14c97836fed346f3c52a9d35823ef437bd4b0d..427df0b4cf379bf6fb3a5edeb12f4c92e48d8e08 100644 (file)
--- a/tests/qemudomaincheckpointxml2xmlout/internal-inactive-invalid.xml
+++ b/tests/qemudomaincheckpointxml2xmlout/internal-inactive-invalid.xml
@@ -24,7 +24,7 @@
     <on_reboot>restart</on_reboot>
     <on_crash>destroy</on_crash>
     <devices>
-      <emulator>/usr/bin/qemu-system-i686</emulator>
+      <emulator>/usr/bin/qemu-system-i386</emulator>
       <disk type='file' device='disk'>
         <driver name='qemu' type='qcow2'/>
         <source file='/tmp/data.img'/>

diff --git a/tests/qemudomaincheckpointxml2xmlout/redefine.xml b/tests/qemudomaincheckpointxml2xmlout/redefine.xml
index 823ae1ee2d040ee523cf2cc2e02fbde099474a7f..524360fb4cd9f55d518b2fc91e41d8c1f51d7035 100644 (file)
--- a/tests/qemudomaincheckpointxml2xmlout/redefine.xml
+++ b/tests/qemudomaincheckpointxml2xmlout/redefine.xml
@@ -22,7 +22,7 @@
     <on_reboot>restart</on_reboot>
     <on_crash>destroy</on_crash>
     <devices>
-      <emulator>/usr/bin/qemu-system-i686</emulator>
+      <emulator>/usr/bin/qemu-system-i386</emulator>
       <disk type='block' device='disk'>
         <driver name='qemu' type='raw'/>
         <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml b/tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml
index a9adbdc2a3e6efb3afcd47a60871bcb4deae4a23..12bc6d953e04c3e5e80e6ac8f000d1bef4d92fd5 100644 (file)
--- a/tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml
+++ b/tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml
@@ -39,7 +39,7 @@
     <on_reboot>restart</on_reboot>
     <on_crash>destroy</on_crash>
     <devices>
-      <emulator>/usr/bin/qemu-system-i686</emulator>
+      <emulator>/usr/bin/qemu-system-i386</emulator>
       <disk type='block' device='disk'>
         <driver name='qemu' type='raw'/>
         <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemudomainsnapshotxml2xmlout/external_vm_redefine.xml b/tests/qemudomainsnapshotxml2xmlout/external_vm_redefine.xml
index 415fa0aed3efd6520dba2c04569e3051f2d9afc4..c165e1f81d3e609a9f1cfb4d9993243a9711e85d 100644 (file)
--- a/tests/qemudomainsnapshotxml2xmlout/external_vm_redefine.xml
+++ b/tests/qemudomainsnapshotxml2xmlout/external_vm_redefine.xml
@@ -29,7 +29,7 @@
     <on_reboot>restart</on_reboot>
     <on_crash>destroy</on_crash>
     <devices>
-      <emulator>/usr/bin/qemu-system-i686</emulator>
+      <emulator>/usr/bin/qemu-system-i386</emulator>
       <disk type='block' device='disk' snapshot='no'>
         <driver name='qemu' type='raw'/>
         <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemudomainsnapshotxml2xmlout/full_domain.xml b/tests/qemudomainsnapshotxml2xmlout/full_domain.xml
index ff3f08950b67ae21b793dafa6cf04a40e92066f5..080f6d50a3f7930d19772479d87502d547a98995 100644 (file)
--- a/tests/qemudomainsnapshotxml2xmlout/full_domain.xml
+++ b/tests/qemudomainsnapshotxml2xmlout/full_domain.xml
@@ -22,7 +22,7 @@
     <on_reboot>restart</on_reboot>
     <on_crash>destroy</on_crash>
     <devices>
-      <emulator>/usr/bin/qemu-system-i686</emulator>
+      <emulator>/usr/bin/qemu-system-i386</emulator>
       <disk type='block' device='disk'>
         <driver name='qemu' type='raw'/>
         <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemudomainsnapshotxml2xmlout/metadata.xml b/tests/qemudomainsnapshotxml2xmlout/metadata.xml
index 1e50494cb513d6526ab19b74871b712bcd807b7d..e5fa60819cc88c8304ebf2b1867afcd5dfc5e203 100644 (file)
--- a/tests/qemudomainsnapshotxml2xmlout/metadata.xml
+++ b/tests/qemudomainsnapshotxml2xmlout/metadata.xml
@@ -26,7 +26,7 @@
     <on_reboot>restart</on_reboot>
     <on_crash>destroy</on_crash>
     <devices>
-      <emulator>/usr/bin/qemu-system-i686</emulator>
+      <emulator>/usr/bin/qemu-system-i386</emulator>
       <disk type='block' device='disk'>
         <driver name='qemu' type='raw'/>
         <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-disk-cdrom.xml b/tests/qemuhotplugtestdomains/qemuhotplug-disk-cdrom.xml
index 341025c477a231eebe29f7064a6985bd21f1f3ab..ad774052661f5c901e4c564f8256d582b6b5dd78 100644 (file)
--- a/tests/qemuhotplugtestdomains/qemuhotplug-disk-cdrom.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-disk-cdrom.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-listen-network.xml b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-listen-network.xml
index 3435dadbcf0a2e5f0e037aa50ade52c24fe2483c..2323521f5e3606e1cade31bf373c24b1508aa4f4 100644 (file)
--- a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-listen-network.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-listen-network.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml
index d3bec1ec8be818a75bdaed3e2575196ec30c13d3..0ca19e9610c7553330178c56a24c4c4b598409e9 100644 (file)
--- a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml
@@ -38,7 +38,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source file='/var/lib/libvirt/images/f14.img'/>

diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice.xml b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice.xml
index 19933bcf2d9508bc4b472cc13299195d7a732997..657b6ccbed801189d99f49be67fafd600a40939f 100644 (file)
--- a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml b/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml
index abd9f6296598c0b5a6c7156a20f5a88867b6e34e..bcef338fda17dc59fff7751d269bdb082e24e5a8 100644 (file)
--- a/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml
+++ b/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml
@@ -39,7 +39,7 @@
     <on_reboot>restart</on_reboot>
     <on_crash>destroy</on_crash>
     <devices>
-      <emulator>/usr/bin/qemu-system-i686</emulator>
+      <emulator>/usr/bin/qemu-system-i386</emulator>
       <disk type='block' device='disk'>
         <driver name='qemu' type='raw'/>
         <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/440fx-ide-address-conflict.xml b/tests/qemuxml2argvdata/440fx-ide-address-conflict.xml
index 4195880aace55aae09806b08196ec44c122cbb63..b72a7b93e30d6d5eeb20d81d727b941c2809e507 100644 (file)
--- a/tests/qemuxml2argvdata/440fx-ide-address-conflict.xml
+++ b/tests/qemuxml2argvdata/440fx-ide-address-conflict.xml
@@ -12,7 +12,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/qemuxml2argvdata/440fx-wrong-root.xml b/tests/qemuxml2argvdata/440fx-wrong-root.xml
index 8e4802d557dd458396458a77c13be843534d2fca..3bd79311f4999b2d3bc4b06c7594d26a4741c9f1 100644 (file)
--- a/tests/qemuxml2argvdata/440fx-wrong-root.xml
+++ b/tests/qemuxml2argvdata/440fx-wrong-root.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pcie-root'/>

diff --git a/tests/qemuxml2argvdata/balloon-device-auto.args b/tests/qemuxml2argvdata/balloon-device-auto.args
index 3a1f010e3ef9897b8cbb995853463b94888a353a..60253f43ec6e495558d004e3a22e50194b3fde10 100644 (file)
--- a/tests/qemuxml2argvdata/balloon-device-auto.args
+++ b/tests/qemuxml2argvdata/balloon-device-auto.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/balloon-device-auto.xml b/tests/qemuxml2argvdata/balloon-device-auto.xml
index 8922f09002ea136e6e16b8c03f5ec63ac43ed86b..ddfc605bd408968508022cc38cf471b7ba4022cd 100644 (file)
--- a/tests/qemuxml2argvdata/balloon-device-auto.xml
+++ b/tests/qemuxml2argvdata/balloon-device-auto.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.args b/tests/qemuxml2argvdata/balloon-device-deflate-off.args
index 619f78bab4500a83ab14d3288986ccf8d06e1135..e81db15972876ce2ae21c5b3fa794e59a2dc299e 100644 (file)
--- a/tests/qemuxml2argvdata/balloon-device-deflate-off.args
+++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.xml b/tests/qemuxml2argvdata/balloon-device-deflate-off.xml
index 59afb74a4386635de0129852c14de46e11fabf03..ecf73abe05084c9cb1cb9025d002abeb0aab4d8f 100644 (file)
--- a/tests/qemuxml2argvdata/balloon-device-deflate-off.xml
+++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.args b/tests/qemuxml2argvdata/balloon-device-deflate.args
index 04fc761c5ff6ff6669d3a95c6c1519c76e7a144c..3aa255187b1bebea13152589f14b951888016cfa 100644 (file)
--- a/tests/qemuxml2argvdata/balloon-device-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-device-deflate.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.xml b/tests/qemuxml2argvdata/balloon-device-deflate.xml
index 25c34ac94cb43087358e9fe167d7171a5fd5d45b..dc443bcea9f277a0697fcd12a45eac70a6fbb3d7 100644 (file)
--- a/tests/qemuxml2argvdata/balloon-device-deflate.xml
+++ b/tests/qemuxml2argvdata/balloon-device-deflate.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/balloon-device-period.args b/tests/qemuxml2argvdata/balloon-device-period.args
index 170fe6a551333a11a62754ec704e3f3888521e47..8a6cc8dec52d3a94dee2de7390701965b9383a1b 100644 (file)
--- a/tests/qemuxml2argvdata/balloon-device-period.args
+++ b/tests/qemuxml2argvdata/balloon-device-period.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/balloon-device-period.xml b/tests/qemuxml2argvdata/balloon-device-period.xml
index d4ab2368cafe54e6877378f20e45c382675a4a7f..8094e7a3083160577a19652d8891db50be84eabe 100644 (file)
--- a/tests/qemuxml2argvdata/balloon-device-period.xml
+++ b/tests/qemuxml2argvdata/balloon-device-period.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/balloon-device.args b/tests/qemuxml2argvdata/balloon-device.args
index 170fe6a551333a11a62754ec704e3f3888521e47..8a6cc8dec52d3a94dee2de7390701965b9383a1b 100644 (file)
--- a/tests/qemuxml2argvdata/balloon-device.args
+++ b/tests/qemuxml2argvdata/balloon-device.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/balloon-device.xml b/tests/qemuxml2argvdata/balloon-device.xml
index 8443ac28ff588cc36388b4a319fadd558be4f05b..3c1c04a45581b8298cca63ec8fb73a6ec0e5ce30 100644 (file)
--- a/tests/qemuxml2argvdata/balloon-device.xml
+++ b/tests/qemuxml2argvdata/balloon-device.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/bios.args b/tests/qemuxml2argvdata/bios.args
index 2edfc1d38e6c83554f70686db736122bcf4ae597..6b636575b149982cc2a9a3666094692787f51f0c 100644 (file)
--- a/tests/qemuxml2argvdata/bios.args
+++ b/tests/qemuxml2argvdata/bios.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name test-bios \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/bios.xml b/tests/qemuxml2argvdata/bios.xml
index a9481e7b5aeabfad24170fd14a49f65b36447d18..82092c1893eb32d9501de9da0aad8fd1c158e8d1 100644 (file)
--- a/tests/qemuxml2argvdata/bios.xml
+++ b/tests/qemuxml2argvdata/bios.xml
@@ -16,7 +16,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-   <emulator>/usr/bin/qemu-system-i686</emulator>
+   <emulator>/usr/bin/qemu-system-i386</emulator>
    <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/blkdeviotune-group-num.args b/tests/qemuxml2argvdata/blkdeviotune-group-num.args
index 63500e9d030aa87b8fd371183258691751d842e6..dfa7155b1e647225c4eca3c7e5c212083c6b1494 100644 (file)
--- a/tests/qemuxml2argvdata/blkdeviotune-group-num.args
+++ b/tests/qemuxml2argvdata/blkdeviotune-group-num.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/blkdeviotune-group-num.xml b/tests/qemuxml2argvdata/blkdeviotune-group-num.xml
index c70d3b2afd6398671860a66d6b391b32de1ed432..c82430a1e9e39a628f63d9a239fd4a13d49fba8e 100644 (file)
--- a/tests/qemuxml2argvdata/blkdeviotune-group-num.xml
+++ b/tests/qemuxml2argvdata/blkdeviotune-group-num.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='qcow2' cache='none'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/blkdeviotune-max-length.args b/tests/qemuxml2argvdata/blkdeviotune-max-length.args
index 12f699aeb8ef02a4daaf00c378a21ffbfa3a334f..5d301a465d1083702ee479b5169b4c60fad178c8 100644 (file)
--- a/tests/qemuxml2argvdata/blkdeviotune-max-length.args
+++ b/tests/qemuxml2argvdata/blkdeviotune-max-length.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/blkdeviotune-max-length.xml b/tests/qemuxml2argvdata/blkdeviotune-max-length.xml
index f2e7528d9882830aac3b40ef76f8cdfc1a277b67..83fea5c5676a510f356a4bb0c4e61fbde5bb9451 100644 (file)
--- a/tests/qemuxml2argvdata/blkdeviotune-max-length.xml
+++ b/tests/qemuxml2argvdata/blkdeviotune-max-length.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='qcow2' cache='none'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/blkdeviotune-max.args b/tests/qemuxml2argvdata/blkdeviotune-max.args
index 623894a63388376fb451f3fa4d30e4d9cfc7f9c9..45484433770bda0b0ed1b03f7aeaa6c511e1d8ce 100644 (file)
--- a/tests/qemuxml2argvdata/blkdeviotune-max.args
+++ b/tests/qemuxml2argvdata/blkdeviotune-max.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/blkdeviotune-max.xml b/tests/qemuxml2argvdata/blkdeviotune-max.xml
index 55e118fcd311f6e1c6248fb15719e5245c8df17f..3c604c2837386716be24fd05c829550dde547830 100644 (file)
--- a/tests/qemuxml2argvdata/blkdeviotune-max.xml
+++ b/tests/qemuxml2argvdata/blkdeviotune-max.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='qcow2' cache='none'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/blkdeviotune.xml b/tests/qemuxml2argvdata/blkdeviotune.xml
index ef5651c53520e4cf8f904f930592701e92e7454e..268b4fb3af127baf05cd7d6f6ea4b977130a2759 100644 (file)
--- a/tests/qemuxml2argvdata/blkdeviotune.xml
+++ b/tests/qemuxml2argvdata/blkdeviotune.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='qcow2' cache='none'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/blkiotune-device.args b/tests/qemuxml2argvdata/blkiotune-device.args
index 3a1f010e3ef9897b8cbb995853463b94888a353a..60253f43ec6e495558d004e3a22e50194b3fde10 100644 (file)
--- a/tests/qemuxml2argvdata/blkiotune-device.args
+++ b/tests/qemuxml2argvdata/blkiotune-device.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/blkiotune-device.xml b/tests/qemuxml2argvdata/blkiotune-device.xml
index 48fd37dba2696645152e99b856f8506433d8fa27..9fdc25b76730929e6b9a176ce4ae248d2bb904fa 100644 (file)
--- a/tests/qemuxml2argvdata/blkiotune-device.xml
+++ b/tests/qemuxml2argvdata/blkiotune-device.xml
@@ -32,7 +32,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/blkiotune.args b/tests/qemuxml2argvdata/blkiotune.args
index 3a1f010e3ef9897b8cbb995853463b94888a353a..60253f43ec6e495558d004e3a22e50194b3fde10 100644 (file)
--- a/tests/qemuxml2argvdata/blkiotune.args
+++ b/tests/qemuxml2argvdata/blkiotune.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/blkiotune.xml b/tests/qemuxml2argvdata/blkiotune.xml
index a0b7b034d3e1f1b278ec4041fb992036d810afa7..9c224f103510cacf9f86c92f7bf608818487915c 100644 (file)
--- a/tests/qemuxml2argvdata/blkiotune.xml
+++ b/tests/qemuxml2argvdata/blkiotune.xml
@@ -16,7 +16,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/boot-cdrom.args b/tests/qemuxml2argvdata/boot-cdrom.args
index 1f9acd0a01d25db155bd6df8ac30fad5111edb15..c5d66e7b827853b49cfcd5a11fa2fa231fd569bb 100644 (file)
--- a/tests/qemuxml2argvdata/boot-cdrom.args
+++ b/tests/qemuxml2argvdata/boot-cdrom.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/boot-cdrom.xml b/tests/qemuxml2argvdata/boot-cdrom.xml
index 584323facc3142b452900191265be09c325bf522..374c8c38ceca27cc3db7af59d9cb5f150a67cf23 100644 (file)
--- a/tests/qemuxml2argvdata/boot-cdrom.xml
+++ b/tests/qemuxml2argvdata/boot-cdrom.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='cdrom'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/cdrom'/>

diff --git a/tests/qemuxml2argvdata/boot-complex.args b/tests/qemuxml2argvdata/boot-complex.args
index e473a53153995dc0b6af4874be9199ad281037d0..0fbfc3c242cbecf3cd291e4501da19f3e5f9f17a 100644 (file)
--- a/tests/qemuxml2argvdata/boot-complex.args
+++ b/tests/qemuxml2argvdata/boot-complex.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/boot-complex.xml b/tests/qemuxml2argvdata/boot-complex.xml
index 6b2bcd8b8783a37e57069a8da5aec5f7be9ac1d2..959acfb4caca6f73b55ee7b5ff0652381a94ae3b 100644 (file)
--- a/tests/qemuxml2argvdata/boot-complex.xml
+++ b/tests/qemuxml2argvdata/boot-complex.xml
@@ -16,7 +16,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <source file='/tmp/vdb.img'/>
       <target dev='vdb' bus='virtio'/>

diff --git a/tests/qemuxml2argvdata/boot-dev+order.xml b/tests/qemuxml2argvdata/boot-dev+order.xml
index 28490b523965c211b6481d303f4719be83aba856..e4bb3b1f483052203f4427add016855f6ad8f4aa 100644 (file)
--- a/tests/qemuxml2argvdata/boot-dev+order.xml
+++ b/tests/qemuxml2argvdata/boot-dev+order.xml
@@ -15,7 +15,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/boot-floppy.args b/tests/qemuxml2argvdata/boot-floppy.args
index f68f51e4f41a5d808b2e2c02592d7c4655239dbb..a2b70dc96a6f95f6dbed797ffa0d49daa1de8475 100644 (file)
--- a/tests/qemuxml2argvdata/boot-floppy.args
+++ b/tests/qemuxml2argvdata/boot-floppy.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/boot-floppy.xml b/tests/qemuxml2argvdata/boot-floppy.xml
index 5731302348331499c97f2c426cba8d46d0786c83..324c9c81d803b53b87add92939848b942e3e9db5 100644 (file)
--- a/tests/qemuxml2argvdata/boot-floppy.xml
+++ b/tests/qemuxml2argvdata/boot-floppy.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/boot-menu-disable-drive.args b/tests/qemuxml2argvdata/boot-menu-disable-drive.args
index 22a87e5cdad4f699a0e61b2d860d57f505df90ea..f3e2c9753750fb34032c350479e667eab0e3da09 100644 (file)
--- a/tests/qemuxml2argvdata/boot-menu-disable-drive.args
+++ b/tests/qemuxml2argvdata/boot-menu-disable-drive.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/boot-menu-disable-drive.xml b/tests/qemuxml2argvdata/boot-menu-disable-drive.xml
index 8d9c1ae7d1020338965c6863a3b09cdf47a69231..e33b61f13f5987cf0f044fe1dc12167ae0aa68c2 100644 (file)
--- a/tests/qemuxml2argvdata/boot-menu-disable-drive.xml
+++ b/tests/qemuxml2argvdata/boot-menu-disable-drive.xml
@@ -14,7 +14,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='cdrom'>
       <source dev='/dev/cdrom'/>
       <target dev='hdc' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/boot-menu-disable-with-timeout.xml b/tests/qemuxml2argvdata/boot-menu-disable-with-timeout.xml
index 19850da21f4ced8c6eeadca5d99eec44ce67f148..a7ae02fda047b3fd4724af10c66533018045083b 100644 (file)
--- a/tests/qemuxml2argvdata/boot-menu-disable-with-timeout.xml
+++ b/tests/qemuxml2argvdata/boot-menu-disable-with-timeout.xml
@@ -14,7 +14,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='cdrom'>
       <source dev='/dev/cdrom'/>
       <target dev='hdc' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/boot-menu-disable.args b/tests/qemuxml2argvdata/boot-menu-disable.args
index 22a87e5cdad4f699a0e61b2d860d57f505df90ea..f3e2c9753750fb34032c350479e667eab0e3da09 100644 (file)
--- a/tests/qemuxml2argvdata/boot-menu-disable.args
+++ b/tests/qemuxml2argvdata/boot-menu-disable.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/boot-menu-disable.xml b/tests/qemuxml2argvdata/boot-menu-disable.xml
index 09d4268d235556c13b55cd46e138f3c818410fdb..6a61f088d915f229013eafc58e80e3a427bb16df 100644 (file)
--- a/tests/qemuxml2argvdata/boot-menu-disable.xml
+++ b/tests/qemuxml2argvdata/boot-menu-disable.xml
@@ -14,7 +14,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='cdrom'>
       <source dev='/dev/cdrom'/>
       <target dev='hdc' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.xml b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.xml
index e0c81ae10f2dc1619384c528e5449df2c8958961..5af6f5bb9528850a3e7b00a7c4c4c7e0f35939e9 100644 (file)
--- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.xml
+++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.xml
@@ -14,7 +14,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='cdrom'>
       <source dev='/dev/cdrom'/>
       <target dev='hdc' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
index 5fa7c31b2a4281b53940fc13d9a1f6ff29adc9c3..4df0ae4624a1ed32dc853d8235fb383451cf4f08 100644 (file)
--- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
+++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.xml b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.xml
index 09232cb28e4c3d1eb209f76d9c65f09844445f55..e467aedd1ec627f11fe1c6de1a130b1f4e1ef3e8 100644 (file)
--- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.xml
+++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.xml
@@ -14,7 +14,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='cdrom'>
       <source dev='/dev/cdrom'/>
       <target dev='hdc' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/boot-menu-enable.args b/tests/qemuxml2argvdata/boot-menu-enable.args
index b95aa3688c79d33146e90af3d832490b3abeced0..83b4fbde440892994619351e0ce829f60a6196f0 100644 (file)
--- a/tests/qemuxml2argvdata/boot-menu-enable.args
+++ b/tests/qemuxml2argvdata/boot-menu-enable.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/boot-menu-enable.xml b/tests/qemuxml2argvdata/boot-menu-enable.xml
index 83b49abddc8cd3d42d0de51f390806f3e2dd16ce..5f2f4aedb4a6cf46bff5ae54feb35c79c71b6d1b 100644 (file)
--- a/tests/qemuxml2argvdata/boot-menu-enable.xml
+++ b/tests/qemuxml2argvdata/boot-menu-enable.xml
@@ -14,7 +14,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='cdrom'>
       <source dev='/dev/cdrom'/>
       <target dev='hdc' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/boot-multi.args b/tests/qemuxml2argvdata/boot-multi.args
index b95aa3688c79d33146e90af3d832490b3abeced0..83b4fbde440892994619351e0ce829f60a6196f0 100644 (file)
--- a/tests/qemuxml2argvdata/boot-multi.args
+++ b/tests/qemuxml2argvdata/boot-multi.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/boot-multi.xml b/tests/qemuxml2argvdata/boot-multi.xml
index acfcd45a400baac6bda342b2545dc9dfeef1157f..83f8e6aa23b42f69769f042a52ae28d64fc90923 100644 (file)
--- a/tests/qemuxml2argvdata/boot-multi.xml
+++ b/tests/qemuxml2argvdata/boot-multi.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='cdrom'>
       <source dev='/dev/cdrom'/>
       <target dev='hdc' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/boot-network.args b/tests/qemuxml2argvdata/boot-network.args
index 100928275fb8a33d13ae65088fd3c504d1851db9..9ca3f75df3a1a30b4f6cbd165eae2590b77d20c7 100644 (file)
--- a/tests/qemuxml2argvdata/boot-network.args
+++ b/tests/qemuxml2argvdata/boot-network.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/boot-network.xml b/tests/qemuxml2argvdata/boot-network.xml
index f0cb4bc7a1e21e383e8b5ab47d165bd11784287c..6233605ac5d65dae9eda55160eb709de6674a52e 100644 (file)
--- a/tests/qemuxml2argvdata/boot-network.xml
+++ b/tests/qemuxml2argvdata/boot-network.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/boot-order.args b/tests/qemuxml2argvdata/boot-order.args
index f2c862968af0f45f7b88457390e782a2738ccc31..57d4b88989e2798b6f6dce0a9308adaef1919ee6 100644 (file)
--- a/tests/qemuxml2argvdata/boot-order.args
+++ b/tests/qemuxml2argvdata/boot-order.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/boot-order.xml b/tests/qemuxml2argvdata/boot-order.xml
index a8e094e854a6f12e2c6b82fecc40c3ae205a8d1a..6a95658ad285bc7c398c2500bd78d5b131dbfd3f 100644 (file)
--- a/tests/qemuxml2argvdata/boot-order.xml
+++ b/tests/qemuxml2argvdata/boot-order.xml
@@ -12,7 +12,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/boot-strict.args b/tests/qemuxml2argvdata/boot-strict.args
index 3da9d70654ab7e7cbd48e5d1fbde62fb5f043d36..827814cbb9f4b9b3a4f4570752e795d580dce038 100644 (file)
--- a/tests/qemuxml2argvdata/boot-strict.args
+++ b/tests/qemuxml2argvdata/boot-strict.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/boot-strict.xml b/tests/qemuxml2argvdata/boot-strict.xml
index 6b2bcd8b8783a37e57069a8da5aec5f7be9ac1d2..959acfb4caca6f73b55ee7b5ff0652381a94ae3b 100644 (file)
--- a/tests/qemuxml2argvdata/boot-strict.xml
+++ b/tests/qemuxml2argvdata/boot-strict.xml
@@ -16,7 +16,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <source file='/tmp/vdb.img'/>
       <target dev='vdb' bus='virtio'/>

diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args b/tests/qemuxml2argvdata/channel-guestfwd.args
index 18f3a5b41063d4c019ccb12050ea47ea84c601c3..0338d0c5e342cf4e33f2ccb777aa4a08d5d7db48 100644 (file)
--- a/tests/qemuxml2argvdata/channel-guestfwd.args
+++ b/tests/qemuxml2argvdata/channel-guestfwd.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/channel-guestfwd.xml b/tests/qemuxml2argvdata/channel-guestfwd.xml
index 240356d7c66445abb011c515db1b1f1e552d3905..e463c2d970643a73bd35cb471d940d9dd474fd07 100644 (file)
--- a/tests/qemuxml2argvdata/channel-guestfwd.xml
+++ b/tests/qemuxml2argvdata/channel-guestfwd.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args b/tests/qemuxml2argvdata/channel-spicevmc.args
index c7845d6ca03192346998d507be880a5b448a0fdc..adb770727033159c94a9df8ea5f5aeb0715c2717 100644 (file)
--- a/tests/qemuxml2argvdata/channel-spicevmc.args
+++ b/tests/qemuxml2argvdata/channel-spicevmc.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=spice \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/channel-spicevmc.xml b/tests/qemuxml2argvdata/channel-spicevmc.xml
index 95d0c206470ffb869d7eb0fcf6984ffea4492d2c..de5029f306d6974a312eff3322b0e20e2d16ad14 100644 (file)
--- a/tests/qemuxml2argvdata/channel-spicevmc.xml
+++ b/tests/qemuxml2argvdata/channel-spicevmc.xml
@@ -12,7 +12,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.args b/tests/qemuxml2argvdata/channel-virtio-auto.args
index 0c439728fbeae07ae64399fd5aa527781a0f7775..e7d6531021a59210aac53e09338353d5d908a984 100644 (file)
--- a/tests/qemuxml2argvdata/channel-virtio-auto.args
+++ b/tests/qemuxml2argvdata/channel-virtio-auto.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.xml b/tests/qemuxml2argvdata/channel-virtio-auto.xml
index 042b94fa81a7c3be280572ac34fe0b8184854d5c..080a9faf95fd3de72d6cb700f7680171acfb53da 100644 (file)
--- a/tests/qemuxml2argvdata/channel-virtio-auto.xml
+++ b/tests/qemuxml2argvdata/channel-virtio-auto.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.args b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
index 23d90f5f0d5b37260717fc44a51e9173f9fa6982..9daac162d03a195a3a7abba717979a49ba911a8f 100644 (file)
--- a/tests/qemuxml2argvdata/channel-virtio-autoadd.args
+++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.xml b/tests/qemuxml2argvdata/channel-virtio-autoadd.xml
index d84d99023649e8ca97fd22e56a7562f1195757d9..2daec88dc907a3a32b715294f92e2710fa10a80e 100644 (file)
--- a/tests/qemuxml2argvdata/channel-virtio-autoadd.xml
+++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.args b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
index 56125fae0670af08c493b0b275e1dee6b8d6915c..67d16620965d140dcc54b2e8b7fef211d61fc6de 100644 (file)
--- a/tests/qemuxml2argvdata/channel-virtio-autoassign.args
+++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.xml b/tests/qemuxml2argvdata/channel-virtio-autoassign.xml
index 32d4b8b1bdcb6a6891fd15fd6ec0f648213271a1..45402468c84d307d6c18f30c0135e987bd943d87 100644 (file)
--- a/tests/qemuxml2argvdata/channel-virtio-autoassign.xml
+++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/channel-virtio-default.args b/tests/qemuxml2argvdata/channel-virtio-default.args
index abc3b797e8081af90f7b3bbb7f8c16247662ca4b..f3e0f591be5abbd00a6d8c136f2d4287d1000325 100644 (file)
--- a/tests/qemuxml2argvdata/channel-virtio-default.args
+++ b/tests/qemuxml2argvdata/channel-virtio-default.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/channel-virtio-default.xml b/tests/qemuxml2argvdata/channel-virtio-default.xml
index fc06dba50128ee71b0bbeaa17f95ef173b55842c..aab9ce1a976f3cb42c2a1988dda2ae5bbf0792d3 100644 (file)
--- a/tests/qemuxml2argvdata/channel-virtio-default.xml
+++ b/tests/qemuxml2argvdata/channel-virtio-default.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/channel-virtio-state.args b/tests/qemuxml2argvdata/channel-virtio-state.args
index d99b75b9be91b506c8547cdac214ac4218118413..38a9f41b1ef21232550064cabfaebea3bbb12672 100644 (file)
--- a/tests/qemuxml2argvdata/channel-virtio-state.args
+++ b/tests/qemuxml2argvdata/channel-virtio-state.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/channel-virtio-state.xml b/tests/qemuxml2argvdata/channel-virtio-state.xml
index 00ed2c63d57b3a9e89608053cd9b28fd6ba3b952..006ba1d048ebeaf5fcbff723fa2819c5b9f11aca 100644 (file)
--- a/tests/qemuxml2argvdata/channel-virtio-state.xml
+++ b/tests/qemuxml2argvdata/channel-virtio-state.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.args b/tests/qemuxml2argvdata/channel-virtio-unix.args
index ecc06941cbdbc3ea3a052f02f21e11dc50530635..fd42b897fd2da5a02f79c2450cb01b4a11cefa9a 100644 (file)
--- a/tests/qemuxml2argvdata/channel-virtio-unix.args
+++ b/tests/qemuxml2argvdata/channel-virtio-unix.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.xml b/tests/qemuxml2argvdata/channel-virtio-unix.xml
index cd0c0ab25648f4c2d0c1dee5c012b547d769ea3c..a34551a9e002c582cd1ccdb255fb85d7ab59906a 100644 (file)
--- a/tests/qemuxml2argvdata/channel-virtio-unix.xml
+++ b/tests/qemuxml2argvdata/channel-virtio-unix.xml
@@ -12,7 +12,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/channel-virtio.args b/tests/qemuxml2argvdata/channel-virtio.args
index 44dd32a21039580b542211cac3fbfeb29ed6ed53..1d22c3633fed407bf8b9daba5ca9abc86910b30e 100644 (file)
--- a/tests/qemuxml2argvdata/channel-virtio.args
+++ b/tests/qemuxml2argvdata/channel-virtio.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/channel-virtio.xml b/tests/qemuxml2argvdata/channel-virtio.xml
index fdeb847da33953dc5d2e5b21e287b084fc9d5d60..0bf7b04d5018a0f1107d8c6cca951f878bccdebf 100644 (file)
--- a/tests/qemuxml2argvdata/channel-virtio.xml
+++ b/tests/qemuxml2argvdata/channel-virtio.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/chardev-reconnect-generated-path.xml b/tests/qemuxml2argvdata/chardev-reconnect-generated-path.xml
index 3cb67ecdcc6aa2dcb92c36bc1ae55485b55a15d1..9f62ae754562f5388004dd16bc98133b2171ac5d 100644 (file)
--- a/tests/qemuxml2argvdata/chardev-reconnect-generated-path.xml
+++ b/tests/qemuxml2argvdata/chardev-reconnect-generated-path.xml
@@ -8,7 +8,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='virtio-serial' index='1'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/>
     </controller>

diff --git a/tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.xml b/tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.xml
index 73dac668164884b408cba7a4f8e47441fa00db16..d3308b4afe948f600d699c623d834abb8c696728 100644 (file)
--- a/tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.xml
+++ b/tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.xml
@@ -8,7 +8,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='virtio-serial' index='1'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/>
     </controller>

diff --git a/tests/qemuxml2argvdata/chardev-reconnect.args b/tests/qemuxml2argvdata/chardev-reconnect.args
index 84e760aba044c2399a2c3ba8b35c1d07fb8ecb67..851052d5a52769898bb5723628623318e847303d 100644 (file)
--- a/tests/qemuxml2argvdata/chardev-reconnect.args
+++ b/tests/qemuxml2argvdata/chardev-reconnect.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/chardev-reconnect.xml b/tests/qemuxml2argvdata/chardev-reconnect.xml
index 41ee248db330564ea5cf3a8f1ec4473737076727..13a4b18bff5dd277b8e1db7970d51092f827bf9d 100644 (file)
--- a/tests/qemuxml2argvdata/chardev-reconnect.xml
+++ b/tests/qemuxml2argvdata/chardev-reconnect.xml
@@ -8,7 +8,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='virtio-serial' index='1'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/>
     </controller>

diff --git a/tests/qemuxml2argvdata/clock-catchup.args b/tests/qemuxml2argvdata/clock-catchup.args
index ca872b96e7488b860a2777af3f17b474612d7828..4cf109a0e81c5c9dc2c779ae1c729e5e35577660 100644 (file)
--- a/tests/qemuxml2argvdata/clock-catchup.args
+++ b/tests/qemuxml2argvdata/clock-catchup.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/clock-catchup.xml b/tests/qemuxml2argvdata/clock-catchup.xml
index 94d2dd03339c1c94c535082348706e047c59ee8b..8c22afe1c87589b9bd33526dbbd9c14d9f450313 100644 (file)
--- a/tests/qemuxml2argvdata/clock-catchup.xml
+++ b/tests/qemuxml2argvdata/clock-catchup.xml
@@ -23,7 +23,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/clock-france.args b/tests/qemuxml2argvdata/clock-france.args
index b08811f884d689694ad5fb803d4ac18d370b9fef..f814906c018a6eef4ba74bc010f39175c3c07796 100644 (file)
--- a/tests/qemuxml2argvdata/clock-france.args
+++ b/tests/qemuxml2argvdata/clock-france.args
@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 TZ=Europe/Paris \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/clock-france.xml b/tests/qemuxml2argvdata/clock-france.xml
index 626b9efcc09a9c46116d61b5aacbbdfb4d6b86ae..be9231e92fa94d28217260459223f6f6e5e3bb37 100644 (file)
--- a/tests/qemuxml2argvdata/clock-france.xml
+++ b/tests/qemuxml2argvdata/clock-france.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/clock-hpet-off.args b/tests/qemuxml2argvdata/clock-hpet-off.args
index 64c8ca111ee56f9dfa3efc835428e681bd3d35b9..89e510e977658e024b6685d272439e4b81c63a19 100644 (file)
--- a/tests/qemuxml2argvdata/clock-hpet-off.args
+++ b/tests/qemuxml2argvdata/clock-hpet-off.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/clock-hpet-off.xml b/tests/qemuxml2argvdata/clock-hpet-off.xml
index 6ae8b809e1db837cfadfdc3ba7da0f3102d27842..4b573464f7ced78bc7e1e4deaaba47be1dd3895c 100644 (file)
--- a/tests/qemuxml2argvdata/clock-hpet-off.xml
+++ b/tests/qemuxml2argvdata/clock-hpet-off.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
index ade15a2b7e7babe7b1c689541c84ea5dddbaa239..4b78d2ac23b4bdb9e745bc0aa3fd3b98acfdd9ec 100644 (file)
--- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
+++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.xml b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.xml
index c29b761b2864caecfc174ad236920e2651c8007f..9924f865c342d530dbeabdc2033b3e3911275c47 100644 (file)
--- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.xml
+++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/clock-localtime.args b/tests/qemuxml2argvdata/clock-localtime.args
index cfbf59c3c55093ad6bfc3a0c76aaa829b76e5a25..e6f80f00859d9e3aef400c3eb4bb62a9d7149706 100644 (file)
--- a/tests/qemuxml2argvdata/clock-localtime.args
+++ b/tests/qemuxml2argvdata/clock-localtime.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/clock-localtime.xml b/tests/qemuxml2argvdata/clock-localtime.xml
index 551459114a062945cad3f95c3173c126ccb44bec..d5f848b9e7ecdcb0f9ac2f1ada46d92a6bef2001 100644 (file)
--- a/tests/qemuxml2argvdata/clock-localtime.xml
+++ b/tests/qemuxml2argvdata/clock-localtime.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
index d75585bf0f5e40730f4de129d44e9f82529d630b..cb96ffbef303f1a47270d27fbfdc7d11e21c404d 100644 (file)
--- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
+++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=kvm,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.xml b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.xml
index 76eead99ad511613d13f444128aef5daa3f667cf..14400f5d7b4df91317cb03daaecc5a9d5a52d88f 100644 (file)
--- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.xml
+++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>

diff --git a/tests/qemuxml2argvdata/clock-utc.args b/tests/qemuxml2argvdata/clock-utc.args
index a9bd75becf26e979082ce44e394bbe1c268d4984..e38898e335ff059a6db24a8f108056f989643a8e 100644 (file)
--- a/tests/qemuxml2argvdata/clock-utc.args
+++ b/tests/qemuxml2argvdata/clock-utc.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/clock-utc.xml b/tests/qemuxml2argvdata/clock-utc.xml
index bddb259630e195d11cfe3c8304de1d2672864a12..7e26f2ed529fa3cbff138e7538f7ba773b0ba92a 100644 (file)
--- a/tests/qemuxml2argvdata/clock-utc.xml
+++ b/tests/qemuxml2argvdata/clock-utc.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/clock-variable.args b/tests/qemuxml2argvdata/clock-variable.args
index afe7c48dc5de9d68408409bdc200df6564e41b00..9fd990da1f768d494fb0cc484c24c231db9169f1 100644 (file)
--- a/tests/qemuxml2argvdata/clock-variable.args
+++ b/tests/qemuxml2argvdata/clock-variable.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/clock-variable.xml b/tests/qemuxml2argvdata/clock-variable.xml
index d3e6396cbf9a1f41f2615441c03df64c8b6ca03a..1cb936a712b9152b96f00ea154070dc14090d8b0 100644 (file)
--- a/tests/qemuxml2argvdata/clock-variable.xml
+++ b/tests/qemuxml2argvdata/clock-variable.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/console-compat-auto.args b/tests/qemuxml2argvdata/console-compat-auto.args
index 683399d307b0c2297a100d298bbbc9a0663eb590..4d6d6e376cc5aac1dc1f271b486ad73c6ec91636 100644 (file)
--- a/tests/qemuxml2argvdata/console-compat-auto.args
+++ b/tests/qemuxml2argvdata/console-compat-auto.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/console-compat-auto.xml b/tests/qemuxml2argvdata/console-compat-auto.xml
index 1789e003c88ff7fd59240f28b47180d5f1103a01..235574745117fa11ee5a1f9297006e8a9f042964 100644 (file)
--- a/tests/qemuxml2argvdata/console-compat-auto.xml
+++ b/tests/qemuxml2argvdata/console-compat-auto.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/console-compat-chardev.args b/tests/qemuxml2argvdata/console-compat-chardev.args
index 683399d307b0c2297a100d298bbbc9a0663eb590..4d6d6e376cc5aac1dc1f271b486ad73c6ec91636 100644 (file)
--- a/tests/qemuxml2argvdata/console-compat-chardev.args
+++ b/tests/qemuxml2argvdata/console-compat-chardev.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/console-compat-chardev.xml b/tests/qemuxml2argvdata/console-compat-chardev.xml
index 939e3aeff29da70409442151b5830e5006b184b1..4acf635bd43b078e663fa400b3cafeac6750be4d 100644 (file)
--- a/tests/qemuxml2argvdata/console-compat-chardev.xml
+++ b/tests/qemuxml2argvdata/console-compat-chardev.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/console-compat.args b/tests/qemuxml2argvdata/console-compat.args
index 539c5a05bc16e5e30438f2300eac2821f064bde4..8a6d72fb6e9f794c62b390f45adaf9eb8b693321 100644 (file)
--- a/tests/qemuxml2argvdata/console-compat.args
+++ b/tests/qemuxml2argvdata/console-compat.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/console-compat.xml b/tests/qemuxml2argvdata/console-compat.xml
index 359511a690177cbe96bf81f1507eb141926a75be..a932b9c4b6819484268dcc89d4834666af4d3995 100644 (file)
--- a/tests/qemuxml2argvdata/console-compat.xml
+++ b/tests/qemuxml2argvdata/console-compat.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/console-compat2.xml b/tests/qemuxml2argvdata/console-compat2.xml
index 74f12409ec5a85f1fcd1f808907ae466951d32d7..16160dcc3b94fe4075ec004fde450e6e7761f7a8 100644 (file)
--- a/tests/qemuxml2argvdata/console-compat2.xml
+++ b/tests/qemuxml2argvdata/console-compat2.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/console-virtio-many.args b/tests/qemuxml2argvdata/console-virtio-many.args
index baa538d69749ad2a3cb2cac026f674a2b207f437..ec81652e2077d42aeff00b8d9386e30489719475 100644 (file)
--- a/tests/qemuxml2argvdata/console-virtio-many.args
+++ b/tests/qemuxml2argvdata/console-virtio-many.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/console-virtio-many.xml b/tests/qemuxml2argvdata/console-virtio-many.xml
index c26a9c294fc10822c0e89d02010315db7d1fba58..a455a3975116d468b4bb5f23f7207245fddf23a7 100644 (file)
--- a/tests/qemuxml2argvdata/console-virtio-many.xml
+++ b/tests/qemuxml2argvdata/console-virtio-many.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/console-virtio.args b/tests/qemuxml2argvdata/console-virtio.args
index 61115cd1b2ce5971d293c693d531a4d69da704b1..30a47a915ba6b4d437a6946ef352d9ad6389c42f 100644 (file)
--- a/tests/qemuxml2argvdata/console-virtio.args
+++ b/tests/qemuxml2argvdata/console-virtio.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/console-virtio.xml b/tests/qemuxml2argvdata/console-virtio.xml
index b9c9c5785f521dddf86798d6bfccaade0177d69f..77fd040b393fd70dc7a68e098c89f95c6eab4862 100644 (file)
--- a/tests/qemuxml2argvdata/console-virtio.xml
+++ b/tests/qemuxml2argvdata/console-virtio.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args
index 1647cfdd977383f33c8dbdc4b4a207fd98585a8c..9d7bf325caee6cbd09bf3a8eda551e4b15ded4a4 100644 (file)
--- a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.xml b/tests/qemuxml2argvdata/controller-virtio-scsi.xml
index 844e4ad397275574f3a6aa97694d28536efb98d7..2474c3bec511f315bd9bcf43bf4bc1ac9d497043 100644 (file)
--- a/tests/qemuxml2argvdata/controller-virtio-scsi.xml
+++ b/tests/qemuxml2argvdata/controller-virtio-scsi.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='sda' bus='scsi'/>

diff --git a/tests/qemuxml2argvdata/cpu-eoi-disabled.args b/tests/qemuxml2argvdata/cpu-eoi-disabled.args
index 57fad2b66602f549a0d85f021c02f41e59f02746..786f9b693cf218d932fd4494b7d62f68f8b11dab 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-eoi-disabled.args
+++ b/tests/qemuxml2argvdata/cpu-eoi-disabled.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/cpu-eoi-disabled.xml b/tests/qemuxml2argvdata/cpu-eoi-disabled.xml
index 62ba7134af0600a02a5be62b6b0a60dd6bf3c969..657de0482afbfb2b9022347e5fa91a44a53f8df8 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-eoi-disabled.xml
+++ b/tests/qemuxml2argvdata/cpu-eoi-disabled.xml
@@ -21,7 +21,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>

diff --git a/tests/qemuxml2argvdata/cpu-eoi-enabled.args b/tests/qemuxml2argvdata/cpu-eoi-enabled.args
index 04836db5fdc2c8c782eb76480e70b008bbada024..90bacb02242eeef814d9eee9dfe722118169769f 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-eoi-enabled.args
+++ b/tests/qemuxml2argvdata/cpu-eoi-enabled.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/cpu-eoi-enabled.xml b/tests/qemuxml2argvdata/cpu-eoi-enabled.xml
index fde0f354bbf8622b3c064c381012322612bb7bb6..bc8934f26022699746d71044601e62db17e6b292 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-eoi-enabled.xml
+++ b/tests/qemuxml2argvdata/cpu-eoi-enabled.xml
@@ -21,7 +21,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>

diff --git a/tests/qemuxml2argvdata/cpu-host-model-features.xml b/tests/qemuxml2argvdata/cpu-host-model-features.xml
index 22034eae5d01c7c75e90c96434982e113508d561..5de4c0cde146356eacd8f64f57b08a483cc56e2c 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-host-model-features.xml
+++ b/tests/qemuxml2argvdata/cpu-host-model-features.xml
@@ -24,7 +24,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
index cbe333ee64e247121614db0c80f6fd25c694ef2b..a4de9d3de9f7363a0a2c56483f1e01ef029a99a7 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
+++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=kvm,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.xml b/tests/qemuxml2argvdata/cpu-host-passthrough-features.xml
index 639dd5f6d9ef61874818c8660c02739f83548ee7..bb4dd87f65a41237ad2385c0063ca8e5c7df3e64 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.xml
+++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.xml
@@ -23,7 +23,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.args b/tests/qemuxml2argvdata/cpu-kvmclock.args
index 10990429d9bdae57bde98861f0d742810bc3c128..39d368a35964b0fe01f1dc24458d9d450c61403e 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-kvmclock.args
+++ b/tests/qemuxml2argvdata/cpu-kvmclock.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=kvm,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.xml b/tests/qemuxml2argvdata/cpu-kvmclock.xml
index 25d3ee757add4a5de3b09c6172c1e71e9e5baa18..2be6066f89f9b3204a0e8fc863de9408746e9bec 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-kvmclock.xml
+++ b/tests/qemuxml2argvdata/cpu-kvmclock.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>

diff --git a/tests/qemuxml2argvdata/cpu-minimum1.args b/tests/qemuxml2argvdata/cpu-minimum1.args
index 94a560b6e77c30d786405830d01fa56838c0b80b..8246efd5634c1b65633ec0a0e81714f00521e83a 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-minimum1.args
+++ b/tests/qemuxml2argvdata/cpu-minimum1.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=kvm,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/cpu-minimum1.xml b/tests/qemuxml2argvdata/cpu-minimum1.xml
index cedd7c658c1f410f7a0ed6a19a26d0b95318a71c..806bf2efb2fb132246acfb85af308f2c237d66b2 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-minimum1.xml
+++ b/tests/qemuxml2argvdata/cpu-minimum1.xml
@@ -16,6 +16,6 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-      <emulator>/usr/bin/qemu-system-i686</emulator>
+      <emulator>/usr/bin/qemu-system-i386</emulator>
   </devices>
 </domain>

diff --git a/tests/qemuxml2argvdata/cputune-iothreads.xml b/tests/qemuxml2argvdata/cputune-iothreads.xml
index 311a1d3604177d9699edf7132a75f387aa57ad6f..d55d85c07d80c6ac4cf61364e0a4fe187cf8070a 100644 (file)
--- a/tests/qemuxml2argvdata/cputune-iothreads.xml
+++ b/tests/qemuxml2argvdata/cputune-iothreads.xml
@@ -25,7 +25,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/cputune-iothreadsched-toomuch.xml b/tests/qemuxml2argvdata/cputune-iothreadsched-toomuch.xml
index 830177e603355a0083800d5a257699f46b54a613..dd9a664939a7df39bfd6d78b80e6dc70d602cbff 100644 (file)
--- a/tests/qemuxml2argvdata/cputune-iothreadsched-toomuch.xml
+++ b/tests/qemuxml2argvdata/cputune-iothreadsched-toomuch.xml
@@ -25,7 +25,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/cputune-iothreadsched-zeropriority.xml b/tests/qemuxml2argvdata/cputune-iothreadsched-zeropriority.xml
index 3d049e31a51cffd1f86d610dedd627cdbf05c15c..1144e0f1325d02d160f8f1e52959ed6f2a7f8560 100644 (file)
--- a/tests/qemuxml2argvdata/cputune-iothreadsched-zeropriority.xml
+++ b/tests/qemuxml2argvdata/cputune-iothreadsched-zeropriority.xml
@@ -24,7 +24,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/cputune-iothreadsched.xml b/tests/qemuxml2argvdata/cputune-iothreadsched.xml
index 56cb434e4ae9003abdd9acceb2a264492665c6af..73bcec602ec1cde9c9d440c47a3d8cfd18c22f17 100644 (file)
--- a/tests/qemuxml2argvdata/cputune-iothreadsched.xml
+++ b/tests/qemuxml2argvdata/cputune-iothreadsched.xml
@@ -25,7 +25,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/cputune-vcpusched-overlap.xml b/tests/qemuxml2argvdata/cputune-vcpusched-overlap.xml
index 2c1667a633587141fab177588b30dd34b797cbbd..4e07f17ad808ec1d1871b9ce14e80636915f641f 100644 (file)
--- a/tests/qemuxml2argvdata/cputune-vcpusched-overlap.xml
+++ b/tests/qemuxml2argvdata/cputune-vcpusched-overlap.xml
@@ -24,7 +24,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/cputune-zero-shares.args b/tests/qemuxml2argvdata/cputune-zero-shares.args
index 3d71d03b9c2bdc2b8c05722c6c72a68a612bc946..7270aafeb73dfc99cbaf24a40b0061cec4c53574 100644 (file)
--- a/tests/qemuxml2argvdata/cputune-zero-shares.args
+++ b/tests/qemuxml2argvdata/cputune-zero-shares.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/cputune-zero-shares.xml b/tests/qemuxml2argvdata/cputune-zero-shares.xml
index cb03330cc614f4d77a85572d1a1393a255d0820a..0b1369fe05e3b639e2728eb15c4a1b7848fc1758 100644 (file)
--- a/tests/qemuxml2argvdata/cputune-zero-shares.xml
+++ b/tests/qemuxml2argvdata/cputune-zero-shares.xml
@@ -21,7 +21,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/cputune.args b/tests/qemuxml2argvdata/cputune.args
index 3d71d03b9c2bdc2b8c05722c6c72a68a612bc946..7270aafeb73dfc99cbaf24a40b0061cec4c53574 100644 (file)
--- a/tests/qemuxml2argvdata/cputune.args
+++ b/tests/qemuxml2argvdata/cputune.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/cputune.xml b/tests/qemuxml2argvdata/cputune.xml
index b67c71c0e67466a3f3fe52e75e9db42ed331884e..d7a5db0bb69f582cfaa7e7b8e0ff831b216753ec 100644 (file)
--- a/tests/qemuxml2argvdata/cputune.xml
+++ b/tests/qemuxml2argvdata/cputune.xml
@@ -25,7 +25,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/debug-threads.args b/tests/qemuxml2argvdata/debug-threads.args
index 23637be1acc567f4ccd3d934c4dee8aa3e917f58..d73625e94e31d6d7446f34ec9891af0931933735 100644 (file)
--- a/tests/qemuxml2argvdata/debug-threads.args
+++ b/tests/qemuxml2argvdata/debug-threads.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/debug-threads.xml b/tests/qemuxml2argvdata/debug-threads.xml
index 9ef92f8feb6270b022ffb848fd1fb2dfe746e906..870190635767b50c23f11fd3e592e5293f1ddb54 100644 (file)
--- a/tests/qemuxml2argvdata/debug-threads.xml
+++ b/tests/qemuxml2argvdata/debug-threads.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/disk-active-commit.xml b/tests/qemuxml2argvdata/disk-active-commit.xml
index 8ed66fdcc0099ee33515687a9a71cdb89d5aa415..28e59dcd85a71938617564ab928ad803e14af49a 100644 (file)
--- a/tests/qemuxml2argvdata/disk-active-commit.xml
+++ b/tests/qemuxml2argvdata/disk-active-commit.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source file='/tmp/HostVG/QEMUGuest1-snap'/>

diff --git a/tests/qemuxml2argvdata/disk-address-conflict.xml b/tests/qemuxml2argvdata/disk-address-conflict.xml
index 3500d373f72ff5310abe87c17c66868ba4f1a989..eeec87d70f431853d84c0ba722e95b344be8d6cd 100644 (file)
--- a/tests/qemuxml2argvdata/disk-address-conflict.xml
+++ b/tests/qemuxml2argvdata/disk-address-conflict.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='sda' bus='sata'/>

diff --git a/tests/qemuxml2argvdata/disk-aio.args b/tests/qemuxml2argvdata/disk-aio.args
index 55ddfcbdf3ed5121e57b715031f2b1cbdadc81bf..1b4dffc84ccba701cbe6bfbc84e7e0264f6310cf 100644 (file)
--- a/tests/qemuxml2argvdata/disk-aio.args
+++ b/tests/qemuxml2argvdata/disk-aio.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args
index 9148b98ba538e7111b18fa234a57dec26c7aaaf5..f8a89493f69990580482c7535fcdb0bf28348680 100644 (file)
--- a/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args b/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args
index a424e58a4894df46592f310b45a66ad88027a6e7..b30edf4dbed839883ab724e1f5a8ac84b92da910 100644 (file)
--- a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-aio.xml b/tests/qemuxml2argvdata/disk-aio.xml
index b1cab775a0da1f63fddafcbc017d7fe0d30d3c9e..02ac3aadc6f7824205e6c6a6266f1f74b3e9dc94 100644 (file)
--- a/tests/qemuxml2argvdata/disk-aio.xml
+++ b/tests/qemuxml2argvdata/disk-aio.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='qcow2' cache='none' io='native'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/disk-attaching-partition-nosupport.xml b/tests/qemuxml2argvdata/disk-attaching-partition-nosupport.xml
index 591819fbb6dbfca29c74764018da7f0a84b8dcf8..019ba451356fd5baa1e6d09ba3e06a85c7757c17 100644 (file)
--- a/tests/qemuxml2argvdata/disk-attaching-partition-nosupport.xml
+++ b/tests/qemuxml2argvdata/disk-attaching-partition-nosupport.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/export/vmimages/1.raw'/>

diff --git a/tests/qemuxml2argvdata/disk-backing-chains-index.xml b/tests/qemuxml2argvdata/disk-backing-chains-index.xml
index 5e0a03fbc4b02efef76d52fb4757de01299bf78e..7ef4e16e8112a195a868cd1b731110eccc67b0e1 100644 (file)
--- a/tests/qemuxml2argvdata/disk-backing-chains-index.xml
+++ b/tests/qemuxml2argvdata/disk-backing-chains-index.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='network' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source protocol='gluster' name='Volume2/Image' index='2'>

diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args
index fb8a62dde371042422afe7443d47059f8b16a9de..a8675debd5a6592212d222e0f7542fdcacb00b62 100644 (file)
--- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args
index a2f030f165635495ea133710f2b658ac3dcb4b91..4108943574e41b27e4eb8ae385c97bf6bcca5d49 100644 (file)
--- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.xml b/tests/qemuxml2argvdata/disk-backing-chains-noindex.xml
index 1336d0fdd6e2d974a5eb4aec9eba3300cb48a2bb..0b78539114d739d6fbc67cbe241de37d60a80252 100644 (file)
--- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.xml
+++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='network' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source protocol='gluster' name='Volume2/Image'>

diff --git a/tests/qemuxml2argvdata/disk-backing-chains.xml b/tests/qemuxml2argvdata/disk-backing-chains.xml
index 2eaafb34e74226f97e68864945b280e8a80e03fe..7fe84da3f09d13d8edea1d00081aaa9e246be50b 100644 (file)
--- a/tests/qemuxml2argvdata/disk-backing-chains.xml
+++ b/tests/qemuxml2argvdata/disk-backing-chains.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='network' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source protocol='gluster' name='Volume2/Image'>

diff --git a/tests/qemuxml2argvdata/disk-blockio.args b/tests/qemuxml2argvdata/disk-blockio.args
index 8ed9ac87fd55de96e12c64d6160b7c4acb3c2740..72aa592fef1099c17acb201ef47769c077fcbb93 100644 (file)
--- a/tests/qemuxml2argvdata/disk-blockio.args
+++ b/tests/qemuxml2argvdata/disk-blockio.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-blockio.xml b/tests/qemuxml2argvdata/disk-blockio.xml
index ea5c8617735a61ee0124fb3e0ab5beb5a6caf1eb..1f78b38cb642769fa8758d61fc25d32d402ead68 100644 (file)
--- a/tests/qemuxml2argvdata/disk-blockio.xml
+++ b/tests/qemuxml2argvdata/disk-blockio.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='cdrom'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/disk-boot-cdrom.args b/tests/qemuxml2argvdata/disk-boot-cdrom.args
index 540df3a736963c72d36f284ad7dba2f4f962d672..c574cb02e6aeeb325f7817c5c516027365596df2 100644 (file)
--- a/tests/qemuxml2argvdata/disk-boot-cdrom.args
+++ b/tests/qemuxml2argvdata/disk-boot-cdrom.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-boot-cdrom.xml b/tests/qemuxml2argvdata/disk-boot-cdrom.xml
index 27ce402e590494214d45a973444313af69946180..53156b1c1ad7b55a5ca1eb8e1e0ad4dab01d0c4d 100644 (file)
--- a/tests/qemuxml2argvdata/disk-boot-cdrom.xml
+++ b/tests/qemuxml2argvdata/disk-boot-cdrom.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/disk-boot-disk.args b/tests/qemuxml2argvdata/disk-boot-disk.args
index 909f060b197c0f20994bf290a97ba7ca3bf9d880..435ddd619448cc07cb62e05c5d612e00ca9ff4b9 100644 (file)
--- a/tests/qemuxml2argvdata/disk-boot-disk.args
+++ b/tests/qemuxml2argvdata/disk-boot-disk.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-boot-disk.xml b/tests/qemuxml2argvdata/disk-boot-disk.xml
index fcd58879202e277df7989bf629ec73faec6168c8..950922f7b8e90a6107a512ece1c54860e79efa6a 100644 (file)
--- a/tests/qemuxml2argvdata/disk-boot-disk.xml
+++ b/tests/qemuxml2argvdata/disk-boot-disk.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args b/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args
index 64db701de844f9b82acc6f32fb3b59d8ad17107e..b598bacb9423a09646adeda6655b82c60fc930d8 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args
+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc-i440fx-2.6,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args
index e1a7299b129e48f16031be87a135649fbeebd329..7279921ae6ff18ccf66bfcbd0cf53d9ee49e7966 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args b/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
index e69fae40ff4ca070720323e34b54e34a1b43a242..82e45effba3e269305cda65805ea0d2be370a7be 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args b/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
index 60b9982549b3172d2092df40a1ef6d7846345ad5..8d0904260a23a165dec6cffafbdaccffe1e72aef 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args
index 49dee03493215009f2078b69c70072e1cb32a67b..3dca80dacd05913b49971ad2e3782aa36a50ccc9 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-cache.xml b/tests/qemuxml2argvdata/disk-cache.xml
index 7e7d45459cba589db735a746ce5b2f28ff3ff428..5104c8469f0c09ba35806cd5bd2469ad7f4929a6 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cache.xml
+++ b/tests/qemuxml2argvdata/disk-cache.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='qcow2' cache='writeback'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args
index b2ac9b5c04ee1fd2fbc919d55315cfb207d65846..d1b75e76078a72bb87c8410d43c28eb454b64a41 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-cdrom-bus-other.xml b/tests/qemuxml2argvdata/disk-cdrom-bus-other.xml
index a142373afb041d7214f0b5bd0886127c3d1b8ac3..e73db8c6abf4746633cbffe8f8f68c6f435666df 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cdrom-bus-other.xml
+++ b/tests/qemuxml2argvdata/disk-cdrom-bus-other.xml
@@ -14,7 +14,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='cdrom'>
       <driver name='qemu' type='raw'/>
       <source file='/root/boot.iso'/>

diff --git a/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args
index bdd89d75061c314bb151e86aa698801e2f1bfc42..88d5fa792963c0c9316951e5731e9027ef6b6f7a 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.xml b/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.xml
index f593b33c910c3c9877cd3200a221bcee737df510..be26ead90e309788a77066ec1a99069ab6b2425d 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.xml
+++ b/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='network' device='cdrom'>
       <driver name='qemu' type='raw'/>
       <target dev='hdd' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/disk-cdrom.args b/tests/qemuxml2argvdata/disk-cdrom.args
index fc9e241a816c217a1a46f08e7c2a15646c40675a..cbac36812949cfc0743cfce9d324dd9d8480a3e3 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cdrom.args
+++ b/tests/qemuxml2argvdata/disk-cdrom.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args
index 9250cf58d0b2714144e048d2d2e12553cab99cbd..2440acc78a0f756ef9e5d96119b3afc4c237c129 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args
index a32daba5e7f992fdd37091fd84122488668a7d82..27c74caf8ef2ed8abd699a69373e9bb60e2bf43f 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-cdrom.xml b/tests/qemuxml2argvdata/disk-cdrom.xml
index f5e9f7395d0240de34cb196b4af773dfa1d430aa..b051b1664268950d1e62521f07bc0eb92188721c 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cdrom.xml
+++ b/tests/qemuxml2argvdata/disk-cdrom.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/disk-device-lun-type-invalid.xml b/tests/qemuxml2argvdata/disk-device-lun-type-invalid.xml
index 956aed866e80039615eaa483a125a8fc31147b0e..84d448ab103cb70b69d7e0f85c0c9785cc5c05c7 100644 (file)
--- a/tests/qemuxml2argvdata/disk-device-lun-type-invalid.xml
+++ b/tests/qemuxml2argvdata/disk-device-lun-type-invalid.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='lun' rawio='yes'>
       <driver name='qemu' type='qcow2'/>
       <source file='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/disk-error-policy.args b/tests/qemuxml2argvdata/disk-error-policy.args
index 6d4c7ea5e22e6a241f66a1a3d3ee9f8fc716a1c8..c339203e2e44b4d465dfef982f23c1920cf8a6e9 100644 (file)
--- a/tests/qemuxml2argvdata/disk-error-policy.args
+++ b/tests/qemuxml2argvdata/disk-error-policy.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args
index 745162079825052945c49580818b6b0bb675ee30..26e8f56e58a4e4ff89a0f5c8404efc43a2b4408b 100644 (file)
--- a/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args b/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args
index 2ed63972bccb3eb3cf69b924a2819e6b770b5941..ee2b05cb8b2fc157be15fd09312e7de575f705ee 100644 (file)
--- a/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-error-policy.xml b/tests/qemuxml2argvdata/disk-error-policy.xml
index 708c13fc0e604c61b9733e95c87be3d355ed407b..0efb374f67875fe7727ec92ea3837d30b8d33604 100644 (file)
--- a/tests/qemuxml2argvdata/disk-error-policy.xml
+++ b/tests/qemuxml2argvdata/disk-error-policy.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='qcow2' cache='none' error_policy='stop'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/disk-fdc-incompatible-address.xml b/tests/qemuxml2argvdata/disk-fdc-incompatible-address.xml
index b454fb7f46d89cedaec4efa7ce40d0ab53d81f7d..3ac2febd5af7c1c7443b4f11d33245d012611a8e 100644 (file)
--- a/tests/qemuxml2argvdata/disk-fdc-incompatible-address.xml
+++ b/tests/qemuxml2argvdata/disk-fdc-incompatible-address.xml
@@ -12,7 +12,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='floppy'>
       <source dev='/dev/fd0'/>
       <target dev='fda' bus='fdc'/>

diff --git a/tests/qemuxml2argvdata/disk-floppy-tray.args b/tests/qemuxml2argvdata/disk-floppy-tray.args
index c350b9969a55cbb1c12b85dd8cf08035575fbc68..e8a4472ebc6ab0abdbb017c227369275f1764674 100644 (file)
--- a/tests/qemuxml2argvdata/disk-floppy-tray.args
+++ b/tests/qemuxml2argvdata/disk-floppy-tray.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-floppy-tray.xml b/tests/qemuxml2argvdata/disk-floppy-tray.xml
index 4b9bc1b6c9986d4f2f709f768f1d41b7d1d319c6..23cc5d49a27c81a61a2c00cf07be644f547e8bd4 100644 (file)
--- a/tests/qemuxml2argvdata/disk-floppy-tray.xml
+++ b/tests/qemuxml2argvdata/disk-floppy-tray.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/disk-floppy.args b/tests/qemuxml2argvdata/disk-floppy.args
index 996f222df61c094cb7b48d2480016030d939e976..83ec46bb9d5384254e01c29ab3877e09c7db7c26 100644 (file)
--- a/tests/qemuxml2argvdata/disk-floppy.args
+++ b/tests/qemuxml2argvdata/disk-floppy.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args
index fd9fe1d54e0535db9dce9743eee0c12559ed3d6d..d4f11f8ca093219cb0c1b72101ee1dabf6573a56 100644 (file)
--- a/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args b/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args
index 1376eaeed61eb7b014a864198df851ba48366f88..1dba6d5666c57c9ee0512d5632b2d68811797ba3 100644 (file)
--- a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-floppy.xml b/tests/qemuxml2argvdata/disk-floppy.xml
index ad840420a1d5b83df56ab873f13eb80de0ae4758..7005351332780ebf94ad7e94638f7dfb5a7a73cf 100644 (file)
--- a/tests/qemuxml2argvdata/disk-floppy.xml
+++ b/tests/qemuxml2argvdata/disk-floppy.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/disk-fmt-cow.xml b/tests/qemuxml2argvdata/disk-fmt-cow.xml
index 91c62ea055a04d59a2f549a5755f3608681ead3a..3ba83a281a44eb14cfd2ab1794808b82e0f6f54a 100644 (file)
--- a/tests/qemuxml2argvdata/disk-fmt-cow.xml
+++ b/tests/qemuxml2argvdata/disk-fmt-cow.xml
@@ -10,7 +10,7 @@
   </os>
   <clock offset='utc'/>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='cow'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/disk-fmt-dir.xml b/tests/qemuxml2argvdata/disk-fmt-dir.xml
index ede3f8e1863ee24a3d6ea1ab72eb2265ac171a6b..8a4f9fa9d5be199ec8e6bb5748fc322d22d49cd3 100644 (file)
--- a/tests/qemuxml2argvdata/disk-fmt-dir.xml
+++ b/tests/qemuxml2argvdata/disk-fmt-dir.xml
@@ -10,7 +10,7 @@
   </os>
   <clock offset='utc'/>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='dir'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/disk-fmt-iso.xml b/tests/qemuxml2argvdata/disk-fmt-iso.xml
index ad2825bfb2527b888cbac51fdbf1c02284d01cc1..834ef696cfb849b1f5c4c2648d7eef8d8bb3b957 100644 (file)
--- a/tests/qemuxml2argvdata/disk-fmt-iso.xml
+++ b/tests/qemuxml2argvdata/disk-fmt-iso.xml
@@ -10,7 +10,7 @@
   </os>
   <clock offset='utc'/>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='iso'/>
       <source file='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/disk-fmt-qcow.args b/tests/qemuxml2argvdata/disk-fmt-qcow.args
index aec12436d7c9387343318cbfc5ea4e7775a9dc96..9c24ce384f2485ab4085670e2057a96bdad58dd1 100644 (file)
--- a/tests/qemuxml2argvdata/disk-fmt-qcow.args
+++ b/tests/qemuxml2argvdata/disk-fmt-qcow.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-fmt-qcow.xml b/tests/qemuxml2argvdata/disk-fmt-qcow.xml
index fe7bbff5f6c1e1b4e00f5c52fc553b46dc034b20..06044266f2371db97930d9f0fed36af472a0b621 100644 (file)
--- a/tests/qemuxml2argvdata/disk-fmt-qcow.xml
+++ b/tests/qemuxml2argvdata/disk-fmt-qcow.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/disk-geometry.args b/tests/qemuxml2argvdata/disk-geometry.args
index ed84a79c7323e2c09f3adeadd9df4cd5eee4610a..eefa7dc24e09f30913494884b72bb36d10d2f80e 100644 (file)
--- a/tests/qemuxml2argvdata/disk-geometry.args
+++ b/tests/qemuxml2argvdata/disk-geometry.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-geometry.xml b/tests/qemuxml2argvdata/disk-geometry.xml
index 4f2b16eed7c96e756347a94fc4c3be09471103a1..3bd802acecd7260a801dbf6522517bb3d512de38 100644 (file)
--- a/tests/qemuxml2argvdata/disk-geometry.xml
+++ b/tests/qemuxml2argvdata/disk-geometry.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <geometry cyls='16383' heads='16' secs='63' trans='lba'/>

diff --git a/tests/qemuxml2argvdata/disk-hostdev-scsi-address-conflict.xml b/tests/qemuxml2argvdata/disk-hostdev-scsi-address-conflict.xml
index 777d8579cadb001bca920aed2cc8b77dfa0c8870..2f6606b91cb7db6029ef9350191db022d5116669 100644 (file)
--- a/tests/qemuxml2argvdata/disk-hostdev-scsi-address-conflict.xml
+++ b/tests/qemuxml2argvdata/disk-hostdev-scsi-address-conflict.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='sda' bus='scsi'/>

diff --git a/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args b/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args
index dbdc296d13331be4df67c9f4a35d013809670bf0..aece52dad20de839bdbd346c2cb3d703d73e46d4 100644 (file)
--- a/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args
+++ b/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest2 \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.xml b/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.xml
index 21a0b11e5c40db434faadb1a133452d9cbb222be..3b13f9284c10b039fbd11cf7600c5ac49a515d91 100644 (file)
--- a/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.xml
+++ b/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
       <auth username='myname'>

diff --git a/tests/qemuxml2argvdata/disk-ide-incompatible-address.xml b/tests/qemuxml2argvdata/disk-ide-incompatible-address.xml
index 4713893cee7b2b0879d0f8af0710f54d6c32cddd..5ca566d20ab0688a37d8bec90b848401cca9f933 100644 (file)
--- a/tests/qemuxml2argvdata/disk-ide-incompatible-address.xml
+++ b/tests/qemuxml2argvdata/disk-ide-incompatible-address.xml
@@ -12,7 +12,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/disk-ide-split.args b/tests/qemuxml2argvdata/disk-ide-split.args
index 8394222efad858b7a0c751d315089bb1851d8ced..c1a0cc7bfc988a770b13c56e88d36aa68348fcdf 100644 (file)
--- a/tests/qemuxml2argvdata/disk-ide-split.args
+++ b/tests/qemuxml2argvdata/disk-ide-split.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-ide-split.xml b/tests/qemuxml2argvdata/disk-ide-split.xml
index 6796886c1f2d42e099c34c6ce82bf01eca08f223..352b5e31fef7bc757364854c483fca8cd9f0f165 100644 (file)
--- a/tests/qemuxml2argvdata/disk-ide-split.xml
+++ b/tests/qemuxml2argvdata/disk-ide-split.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='cdrom'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/disk-ide-wwn.args b/tests/qemuxml2argvdata/disk-ide-wwn.args
index 61c13f4253f0f4c03554be46fc1486ed08a85b0f..939daad00d906042d9d45a0b19d8722f4a173c37 100644 (file)
--- a/tests/qemuxml2argvdata/disk-ide-wwn.args
+++ b/tests/qemuxml2argvdata/disk-ide-wwn.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-ide-wwn.xml b/tests/qemuxml2argvdata/disk-ide-wwn.xml
index c512cc6f090ef2954cc84bbb59af055dcb8724c5..7b84b7e9eeb93774381f838e27de41f4dd95b6f9 100644 (file)
--- a/tests/qemuxml2argvdata/disk-ide-wwn.xml
+++ b/tests/qemuxml2argvdata/disk-ide-wwn.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/disk-iscsi.args b/tests/qemuxml2argvdata/disk-iscsi.args
index 278f46ae121f56a61a86feee6722f7fbba1efa83..9297e95127e9e2383c27c8bcaf61223f81de070d 100644 (file)
--- a/tests/qemuxml2argvdata/disk-iscsi.args
+++ b/tests/qemuxml2argvdata/disk-iscsi.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-iscsi.xml b/tests/qemuxml2argvdata/disk-iscsi.xml
index 98f04e26a41b669158064379b18058d6ff57c5c8..04d821989f2424a83f5b36ab6a9a84d998e3cb39 100644 (file)
--- a/tests/qemuxml2argvdata/disk-iscsi.xml
+++ b/tests/qemuxml2argvdata/disk-iscsi.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/disk/by-path/ip-192.168.44.1:3260-iscsi-iqn.2011-02.lan.hdserver:hydrar-desktop.win7vm-lun-0'/>

diff --git a/tests/qemuxml2argvdata/disk-mirror-old.xml b/tests/qemuxml2argvdata/disk-mirror-old.xml
index 12507945637cc1c886070deac73ec1f4ef09907c..8aca54f05b16aa5b5ee79e65b84155730b4568ba 100644 (file)
--- a/tests/qemuxml2argvdata/disk-mirror-old.xml
+++ b/tests/qemuxml2argvdata/disk-mirror-old.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <backingStore/>

diff --git a/tests/qemuxml2argvdata/disk-mirror.xml b/tests/qemuxml2argvdata/disk-mirror.xml
index 5a825c54ac6f4fbc1a124f678f56a147574c8e34..2d61fe29c3f3af67916f56363d0e7f28605adff3 100644 (file)
--- a/tests/qemuxml2argvdata/disk-mirror.xml
+++ b/tests/qemuxml2argvdata/disk-mirror.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <backingStore/>

diff --git a/tests/qemuxml2argvdata/disk-network-gluster.args b/tests/qemuxml2argvdata/disk-network-gluster.args
index ac5fd8f3c803e0b7d1d120ad9958a14985afe95e..7664284f7cbbbef2d20160df5241220d0364d11e 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-gluster.args
+++ b/tests/qemuxml2argvdata/disk-network-gluster.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args
index bca51ff5d767d8c8c64c82c5ebe80ad74e6649b3..2721147b3aa402ef49b94e2b9fa9df66f8948b9b 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args
index 76aeccf6d8d3fbbeb6e37035cdd7ffa79aa54e1b..2c5bf86c2de9adc5397e9cbc22cc5ba1985cb116 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-network-gluster.xml b/tests/qemuxml2argvdata/disk-network-gluster.xml
index 8ba4e50b36b7e45ab52e05c946a603f9413d1770..c20a57a59a9fd4e44894ba18cbde0d64c9901b24 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-gluster.xml
+++ b/tests/qemuxml2argvdata/disk-network-gluster.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
       <source protocol='gluster' name='Volume1/Image'>

diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-auth-secrettype-invalid.xml b/tests/qemuxml2argvdata/disk-network-iscsi-auth-secrettype-invalid.xml
index 7e6b623c3a97532f14acc0836780b6dce378c4d2..03512ec6c937976a4816a90ab4b0428270a42f55 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-iscsi-auth-secrettype-invalid.xml
+++ b/tests/qemuxml2argvdata/disk-network-iscsi-auth-secrettype-invalid.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
       <auth username='myname'>

diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-auth-wrong-secrettype.xml b/tests/qemuxml2argvdata/disk-network-iscsi-auth-wrong-secrettype.xml
index 4854abd6c996c98b0c1381b93ce80a70437f2b5b..9c48a4a70041f53944402d34aa29d99ee96c2528 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-iscsi-auth-wrong-secrettype.xml
+++ b/tests/qemuxml2argvdata/disk-network-iscsi-auth-wrong-secrettype.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
       <auth username='myname'>

diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args b/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
index a5035a56f043530ae417e7cce98449a26b02fc0d..762dc0e04addd1c9d553cc8f3d44eac248abf645 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
+++ b/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-modern.xml b/tests/qemuxml2argvdata/disk-network-iscsi-modern.xml
index d1be9c4e7dfb65419ba0341a14fbc8caba5d8219..759d5e217f6acec9dab6748d6a380592209399a3 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-iscsi-modern.xml
+++ b/tests/qemuxml2argvdata/disk-network-iscsi-modern.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
       <source protocol='iscsi' name='iqn.1992-01.com.example'>

diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.args b/tests/qemuxml2argvdata/disk-network-iscsi.args
index 3a500c0ca07020ef4f531255ca105349fee491b4..53b3821ea7141b674722f8bfa1b9095b78b30a8c 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-iscsi.args
+++ b/tests/qemuxml2argvdata/disk-network-iscsi.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args
index 372888e4446a0277c6905bf95b7201d32ede0bba..55347521dad2a4bdcd481e1f3e2447a8bb99c223 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args
index 5bf3e350df9b4acd1ab651981c7b415a1d5655ee..8831db662239684784ba2f0a9c9f0536fb93e221 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.xml b/tests/qemuxml2argvdata/disk-network-iscsi.xml
index ecc8ead3cc732a063b2c3c91de38a0c006567846..8a55f1b23b2eb42759d2f69d2bb8762a0012f52e 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-iscsi.xml
+++ b/tests/qemuxml2argvdata/disk-network-iscsi.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
       <source protocol='iscsi' name='iqn.1992-01.com.example'>

diff --git a/tests/qemuxml2argvdata/disk-network-nbd.args b/tests/qemuxml2argvdata/disk-network-nbd.args
index d78830aa3bf9efca41b378672325e6f90a385184..17576fe932e688af14d0af08ee4e9577aac4961f 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-nbd.args
+++ b/tests/qemuxml2argvdata/disk-network-nbd.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args
index a462dcfd27587190788d2f4c3f3f6a38a373a8ae..1742f01e256cf4763a0d43e4dadcfd9f2f12a9b6 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args
index 95ef39093c6decd6e064ff37077cde036f838e67..8dd224b4b220856eb0267e17ec984c6c40fef6f5 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-network-nbd.xml b/tests/qemuxml2argvdata/disk-network-nbd.xml
index f9630d6655b5ebcf5c0aefbad656cfe1d31e95be..eda00c103e309cf51a112e38541435b2a4ea5341 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-nbd.xml
+++ b/tests/qemuxml2argvdata/disk-network-nbd.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
       <source protocol='nbd'>

diff --git a/tests/qemuxml2argvdata/disk-network-rbd-no-colon.xml b/tests/qemuxml2argvdata/disk-network-rbd-no-colon.xml
index 66e149baf4324c782fc19d038f7f7ac9b0212bba..e3a04afebd0399aed4cd7be3055d3853a170371c 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-rbd-no-colon.xml
+++ b/tests/qemuxml2argvdata/disk-network-rbd-no-colon.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args
index 80969bdc433074e4ecc9d20d60b128d774bf6f52..18cb534552e9a43a1b2504d4ab382625bf17bcdc 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args
index 4920bfb52058bd12af55a2ca17787b99fe9bcef4..50af3eb653c2fe7dca64098d228202dd72c1050a 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args
+++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc-i440fx-2.5,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args
index 28cea02729831bbe8d3161fef5709119f802ec21..2d05e63cd2a9b1db0ab963bddcd8567acc863b20 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-network-rbd.xml b/tests/qemuxml2argvdata/disk-network-rbd.xml
index 124a80cdf8494d896b4467f5f481aabe519638ff..b516a755a82b2a8e971c4067fcce5063fb79f54f 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-rbd.xml
+++ b/tests/qemuxml2argvdata/disk-network-rbd.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
       <source protocol='rbd' name='pool/image'>

diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.args b/tests/qemuxml2argvdata/disk-network-sheepdog.args
index 9bc0b1e101e1e7273a765102a503f3cdcb872f6b..cf832062bb64475be73f73d6fa2e226d1534e984 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-sheepdog.args
+++ b/tests/qemuxml2argvdata/disk-network-sheepdog.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args
index 25f6e4b7f5880938cbc8599482f86799e941ec27..653fa1af4033dbeed247656b737fae947b024e4c 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args
index c2b1156f0c94f4207e5fba2f2762328eadf786b3..03ceb36a546b476c5da20fbc040f92917a25e4a9 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.xml b/tests/qemuxml2argvdata/disk-network-sheepdog.xml
index 131a3fc3f2b8cf9999b91dd2e83b880b4bdb9ce5..3d6d3b2ae95873af641df1e4c1cbe05b60e52da5 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-sheepdog.xml
+++ b/tests/qemuxml2argvdata/disk-network-sheepdog.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMU,Guest,,1'/>

diff --git a/tests/qemuxml2argvdata/disk-network-source-auth-both.xml b/tests/qemuxml2argvdata/disk-network-source-auth-both.xml
index fed75ad70e11095b47cc84b0f7f6651de256a358..852e2eaae2d48a5bdbf91d6339579a15d8225609 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-source-auth-both.xml
+++ b/tests/qemuxml2argvdata/disk-network-source-auth-both.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
       <auth username='myname'>

diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.args b/tests/qemuxml2argvdata/disk-network-source-auth.args
index e177baf511ccbc9bf908fdac91056be42630af36..e68b81fde0aefc3657c4492843dfd72c64bce93c 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-source-auth.args
+++ b/tests/qemuxml2argvdata/disk-network-source-auth.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args
index caba0151876ded875246c26a1c479af4ced905a8..f34c6b678dd5685f18f6b6dffdc59217383bf566 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args
index 357a277c46d1700b69bdc3f1cada181dbe84a879..057cd97273b83f18bf93702612eece7f062928d5 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.xml b/tests/qemuxml2argvdata/disk-network-source-auth.xml
index bd84cc42f62f80c8f35d7ad851f2994b572e4c7e..7cc5c96ae70b99ff27bf7403a0534ea9eaa77737 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-source-auth.xml
+++ b/tests/qemuxml2argvdata/disk-network-source-auth.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
       <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1'>

diff --git a/tests/qemuxml2argvdata/disk-no-boot.args b/tests/qemuxml2argvdata/disk-no-boot.args
index 94c6186062fa40d924e69c8e3f77f8425d621b1c..190129ea973da44ecb9db2c57882d0602b9afd45 100644 (file)
--- a/tests/qemuxml2argvdata/disk-no-boot.args
+++ b/tests/qemuxml2argvdata/disk-no-boot.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-no-boot.xml b/tests/qemuxml2argvdata/disk-no-boot.xml
index 03533477f4e2989a2d629d51d7a9a4b0cdd90160..9125013e7b6b6fbb5cff1130ab57e313a537c3e4 100644 (file)
--- a/tests/qemuxml2argvdata/disk-no-boot.xml
+++ b/tests/qemuxml2argvdata/disk-no-boot.xml
@@ -15,7 +15,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/disk-order.args b/tests/qemuxml2argvdata/disk-order.args
index 1d4e490de4e79d6b05318d4c708ac94503f8b5a8..d85c4017edb23fad6326ae9e81ba1634eea70c4d 100644 (file)
--- a/tests/qemuxml2argvdata/disk-order.args
+++ b/tests/qemuxml2argvdata/disk-order.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-order.xml b/tests/qemuxml2argvdata/disk-order.xml
index e9dfc2e466c4daca8cd029cae8f0d166ed6a62f9..4586faa54a3b3c16ce155cf1bf3bde3381b803e8 100644 (file)
--- a/tests/qemuxml2argvdata/disk-order.xml
+++ b/tests/qemuxml2argvdata/disk-order.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='cdrom'>
       <source dev='/dev/HostVG/QEMUGuest2'/>
       <target dev='hdc' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.args b/tests/qemuxml2argvdata/disk-readonly-disk.args
index 4b58ff143274861b92d7fa2fdb17dc501add8bdd..6e25779ce08701734dba8cf664471c0dfb9ae985 100644 (file)
--- a/tests/qemuxml2argvdata/disk-readonly-disk.args
+++ b/tests/qemuxml2argvdata/disk-readonly-disk.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args
index 87719ff12bf93c117fbf581a893cd58578477ab6..34ef2046326288e02fbd72843b4035541578e74a 100644 (file)
--- a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args
index 5ca36c08716cf3eee7151bc2402a01ac3fc2aabe..aeda701bfebb2e2ebac067d32c9f3f750f7f5464 100644 (file)
--- a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.xml b/tests/qemuxml2argvdata/disk-readonly-disk.xml
index 137ab0a92359ae4231c90ddee2e2e19c943375f6..a01d2073c835ee21d5760c66996097579cbd13d9 100644 (file)
--- a/tests/qemuxml2argvdata/disk-readonly-disk.xml
+++ b/tests/qemuxml2argvdata/disk-readonly-disk.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/disk-same-targets.xml b/tests/qemuxml2argvdata/disk-same-targets.xml
index 799b299a29e23e063f9e395ed99bdb8137a12691..c1104a8eab43c4e1a700c15392905385444949ec 100644 (file)
--- a/tests/qemuxml2argvdata/disk-same-targets.xml
+++ b/tests/qemuxml2argvdata/disk-same-targets.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/disk-sata-device.args b/tests/qemuxml2argvdata/disk-sata-device.args
index e0d242a494499db59a76623905d0fe776060fad5..572ca20eb2b9f607aa98cad699c18c7f44dc3e13 100644 (file)
--- a/tests/qemuxml2argvdata/disk-sata-device.args
+++ b/tests/qemuxml2argvdata/disk-sata-device.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-sata-device.xml b/tests/qemuxml2argvdata/disk-sata-device.xml
index 9cae432231858da68e63dc54febdb96a5b30de06..9f711451b16e56b0eeaa8bf74777f866bbf27132 100644 (file)
--- a/tests/qemuxml2argvdata/disk-sata-device.xml
+++ b/tests/qemuxml2argvdata/disk-sata-device.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='sda' bus='sata'/>

diff --git a/tests/qemuxml2argvdata/disk-sata-incompatible-address.xml b/tests/qemuxml2argvdata/disk-sata-incompatible-address.xml
index 20c9a0860a49ecb149703f8d2605780f30ae6727..72f8a0bcbb5209df6ee044284a88950d7b8fee2b 100644 (file)
--- a/tests/qemuxml2argvdata/disk-sata-incompatible-address.xml
+++ b/tests/qemuxml2argvdata/disk-sata-incompatible-address.xml
@@ -12,7 +12,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args
index 89d692602c77163cc787fe3bf51100beec42ff92..b3cf61b112d35a7639a1b964f657199c427a802a 100644 (file)
--- a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args
+++ b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc-i440fx-1.5,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args
index 7cff9c94b646a6456a10d13d5b0b71a4c617c6ab..f75da5425a89eb2bcfe8e14df635caa6117bd220 100644 (file)
--- a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-scsi-device-auto.xml b/tests/qemuxml2argvdata/disk-scsi-device-auto.xml
index 66aa6fa96aa2d6fe86673897b6223c4addb94de4..4c0c35dbf8a49d431b4232b056c67965b792b502 100644 (file)
--- a/tests/qemuxml2argvdata/disk-scsi-device-auto.xml
+++ b/tests/qemuxml2argvdata/disk-scsi-device-auto.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-split.args b/tests/qemuxml2argvdata/disk-scsi-disk-split.args
index 7d20d861eb2c1c9513e71e407876e2c43a34281f..a0ef28d7779bcc35ff7960f9154ce14b6b3c4639 100644 (file)
--- a/tests/qemuxml2argvdata/disk-scsi-disk-split.args
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-split.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-split.xml b/tests/qemuxml2argvdata/disk-scsi-disk-split.xml
index c3105c3fb98a84635f3bbaaa38e07c0c8438aacc..757981a7b75c5c8be679b91980dc9b710c43bd9d 100644 (file)
--- a/tests/qemuxml2argvdata/disk-scsi-disk-split.xml
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-split.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='cdrom'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='sda' bus='scsi'/>

diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.xml b/tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.xml
index 6c83715be20fc542351157a304c4f6375def1763..a49170e63e42e9929cf962bc40c6e4118f3d631e 100644 (file)
--- a/tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.xml
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='sda' bus='virtio'/>

diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
index 77d8eecd5d05e81fcf61f63cf771924e3f1de2e5..8cc1057613071831a6e56496433dcaad6fd5332e 100644 (file)
--- a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.xml b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.xml
index 13125e9be87362535db9db8435316118e958f37c..aadfa596083b3d112256fb835ed2eab96a210893 100644 (file)
--- a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.xml
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='cdrom'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='sda' bus='scsi'/>

diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
index 06df67d3d17fe4eb12ce6ae5ddc0ef66adb05d42..7c92f85f43910a609d1f15f1a4f42729431f57f3 100644 (file)
--- a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.xml b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.xml
index b398473c6e30db7c56a74aa109b17b9f983d7d8f..0bbc1fc1e3cf19c69a01ef063a2160df1515bbe3 100644 (file)
--- a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.xml
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='cdrom'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='sda' bus='scsi'/>

diff --git a/tests/qemuxml2argvdata/disk-scsi-incompatible-address.xml b/tests/qemuxml2argvdata/disk-scsi-incompatible-address.xml
index bdf6a1bb0920327be257e392e17e216374ac93d8..74eb327a1f99a347330d2c26fbcb2ff5b4732f81 100644 (file)
--- a/tests/qemuxml2argvdata/disk-scsi-incompatible-address.xml
+++ b/tests/qemuxml2argvdata/disk-scsi-incompatible-address.xml
@@ -12,7 +12,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough-sgio.xml b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough-sgio.xml
index f5eda6ef1853a9467133d5285049ebbf26bd0d30..3e561642a349818a07052473e8edb7b6dff051a5 100644 (file)
--- a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough-sgio.xml
+++ b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough-sgio.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='lun' rawio='no' sgio='unfiltered'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='scsi'/>

diff --git a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
index 2161c09c042c63f6102725b782d85d9dd04182e5..9f51c6d906d068d1156a432ba3f5868f8154b4a5 100644 (file)
--- a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
+++ b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.xml b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.xml
index 5028908254c1d3678750814be6cc0121dbdbc598..1ab8a39ea750380c3045cd10d61c71bec15d1e46 100644 (file)
--- a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.xml
+++ b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='lun'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='scsi'/>

diff --git a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args
index ad07d206d66c779741797ef316c3dd0545206cd4..a7d85b58db448bf05b4a53c2ca237fa0f80baf89 100644 (file)
--- a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-scsi.xml b/tests/qemuxml2argvdata/disk-scsi.xml
index dda413eb0c08bd452464af5444903be38e3eabde..7fbb785a37d10cbb82fe4322c1c05f47fc89b10c 100644 (file)
--- a/tests/qemuxml2argvdata/disk-scsi.xml
+++ b/tests/qemuxml2argvdata/disk-scsi.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/disk-serial.args b/tests/qemuxml2argvdata/disk-serial.args
index bdd67c23f5f98c9a45616f8e5f5772e210238f29..bbd10a106ab47903cd226396ffcbda3da24647e1 100644 (file)
--- a/tests/qemuxml2argvdata/disk-serial.args
+++ b/tests/qemuxml2argvdata/disk-serial.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=kvm,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-serial.xml b/tests/qemuxml2argvdata/disk-serial.xml
index 18e72bb4ba47cd2af38c97090e6b8e2ab5c5ebc1..88572871df90c78560e7f2b340e26fbb190d9c19 100644 (file)
--- a/tests/qemuxml2argvdata/disk-serial.xml
+++ b/tests/qemuxml2argvdata/disk-serial.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/disk-shared-qcow.xml b/tests/qemuxml2argvdata/disk-shared-qcow.xml
index ca88a944b371ee9007d92c1e52a77b5a1724971d..358e65f7a05b7d45580303d084e1dc94238a0e2a 100644 (file)
--- a/tests/qemuxml2argvdata/disk-shared-qcow.xml
+++ b/tests/qemuxml2argvdata/disk-shared-qcow.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args
index 94eb0fe05c92038a9591485f4b813eda6e621994..d35e7a5f6ec774a2a7f55092c4be82c26e7edc98 100644 (file)
--- a/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args
index 375e2de5608175aa4674dd7488732a210a84f0c3..9ab0e8cf39c47841c890c56541af36ced589b907 100644 (file)
--- a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-shared.xml b/tests/qemuxml2argvdata/disk-shared.xml
index ec351ee1aea142b6230fa23649b6bb1ea9d549ba..952d9abebfc9cb71ac19c8613221c810166bb8b7 100644 (file)
--- a/tests/qemuxml2argvdata/disk-shared.xml
+++ b/tests/qemuxml2argvdata/disk-shared.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/disk-snapshot.args b/tests/qemuxml2argvdata/disk-snapshot.args
index 1bd26551f3886f867266ac793ec7df57b4223d3f..909853635614796536a44ba796accdc8144e1806 100644 (file)
--- a/tests/qemuxml2argvdata/disk-snapshot.args
+++ b/tests/qemuxml2argvdata/disk-snapshot.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-snapshot.xml b/tests/qemuxml2argvdata/disk-snapshot.xml
index 56e56ffe744d124bcc8df78a579fa3fd676b9092..661a044ea0402e63f8f8a2f7ccf7ab2aab350ee7 100644 (file)
--- a/tests/qemuxml2argvdata/disk-snapshot.xml
+++ b/tests/qemuxml2argvdata/disk-snapshot.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk' snapshot='internal'>
       <driver name='qemu' type='qcow2' cache='none'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/disk-source-pool-mode.args b/tests/qemuxml2argvdata/disk-source-pool-mode.args
index e76ff9067fc64d30218209ce5004d9d6432a4ee1..d55fcf0ff4e72feede85d6403d2183751df07561 100644 (file)
--- a/tests/qemuxml2argvdata/disk-source-pool-mode.args
+++ b/tests/qemuxml2argvdata/disk-source-pool-mode.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-source-pool-mode.xml b/tests/qemuxml2argvdata/disk-source-pool-mode.xml
index 3f5a2d5246c276a90c4cf1d76a24310c098d849d..512ffe5e18e4f5f93c41b7c94222981af0c5b29a 100644 (file)
--- a/tests/qemuxml2argvdata/disk-source-pool-mode.xml
+++ b/tests/qemuxml2argvdata/disk-source-pool-mode.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='volume' device='cdrom'>
       <source pool='pool-iscsi-auth' volume='unit:0:0:1' mode='host'>
         <seclabel model='selinux' relabel='yes'>

diff --git a/tests/qemuxml2argvdata/disk-source-pool.args b/tests/qemuxml2argvdata/disk-source-pool.args
index 7c055998225fe6445cdf521b70445a02826ed083..f37a7b3b679ddfe9fa5837d6163e136833e0fcd8 100644 (file)
--- a/tests/qemuxml2argvdata/disk-source-pool.args
+++ b/tests/qemuxml2argvdata/disk-source-pool.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-source-pool.xml b/tests/qemuxml2argvdata/disk-source-pool.xml
index 31b148b4bb470d336f83c949651de5e9926e0aa7..a6ce7fd3494426d51a97e1d0e551b46c64c9fd64 100644 (file)
--- a/tests/qemuxml2argvdata/disk-source-pool.xml
+++ b/tests/qemuxml2argvdata/disk-source-pool.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <!-- For this disk, intentionally stress parser resilience to
          atypical ordering -->
     <disk device='cdrom' type='volume'>

diff --git a/tests/qemuxml2argvdata/disk-transient.xml b/tests/qemuxml2argvdata/disk-transient.xml
index 55e5374400a6978b1cf31496aac43604b0939b78..00ddb6487a682971cdd1f8d49be5018173806a16 100644 (file)
--- a/tests/qemuxml2argvdata/disk-transient.xml
+++ b/tests/qemuxml2argvdata/disk-transient.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='qcow2' cache='none'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/disk-usb-device-removable.args b/tests/qemuxml2argvdata/disk-usb-device-removable.args
index 99287c6c4074ad112e967de7362bbeca191f91ef..61ca1589a21bacffc855b16be5b59281963b15ac 100644 (file)
--- a/tests/qemuxml2argvdata/disk-usb-device-removable.args
+++ b/tests/qemuxml2argvdata/disk-usb-device-removable.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-usb-device-removable.xml b/tests/qemuxml2argvdata/disk-usb-device-removable.xml
index 632780030d1c1e0491b0a28de15e63fc832cd863..1375c457144daaef6c79e73de52604e4b405c2ed 100644 (file)
--- a/tests/qemuxml2argvdata/disk-usb-device-removable.xml
+++ b/tests/qemuxml2argvdata/disk-usb-device-removable.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/disk-usb-device.args b/tests/qemuxml2argvdata/disk-usb-device.args
index c313888e36d4e9929f8278bb125529c7064533ac..515be277cfa54c2309256f573e43f2f9f867f59f 100644 (file)
--- a/tests/qemuxml2argvdata/disk-usb-device.args
+++ b/tests/qemuxml2argvdata/disk-usb-device.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-usb-device.xml b/tests/qemuxml2argvdata/disk-usb-device.xml
index a24bb2ff6f4d7d001c080f1608d4409ec7345466..19a536868bf097476a8e75f7118df54b3e19fe50 100644 (file)
--- a/tests/qemuxml2argvdata/disk-usb-device.xml
+++ b/tests/qemuxml2argvdata/disk-usb-device.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/disk-usb-nosupport.xml b/tests/qemuxml2argvdata/disk-usb-nosupport.xml
index 98e3bbc02b5e0cd9619035c972cb7f4440579046..b88ecf1935d517b526a9dccb64b775e75483c4f5 100644 (file)
--- a/tests/qemuxml2argvdata/disk-usb-nosupport.xml
+++ b/tests/qemuxml2argvdata/disk-usb-nosupport.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/disk-usb-pci.xml b/tests/qemuxml2argvdata/disk-usb-pci.xml
index 5b96c7d7d255e5c94267732b9dd8e3b4055bd85b..7f76b24314b763e425e92b56608f5037f2649647 100644 (file)
--- a/tests/qemuxml2argvdata/disk-usb-pci.xml
+++ b/tests/qemuxml2argvdata/disk-usb-pci.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/disk-virtio-queues.args b/tests/qemuxml2argvdata/disk-virtio-queues.args
index d14cf7681c6601f7a3a6450f06c1b70b1f800d8a..bd3a1a9135b75f9b956643b11b8065cf75148b18 100644 (file)
--- a/tests/qemuxml2argvdata/disk-virtio-queues.args
+++ b/tests/qemuxml2argvdata/disk-virtio-queues.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-virtio-queues.xml b/tests/qemuxml2argvdata/disk-virtio-queues.xml
index 37885c6f9c538f8124352b5333424a4f94a641de..641204e71f834ffcf4d09638eea2369a971bc2e2 100644 (file)
--- a/tests/qemuxml2argvdata/disk-virtio-queues.xml
+++ b/tests/qemuxml2argvdata/disk-virtio-queues.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw' queues='4'/>
       <source file='/tmp/data.img'/>

diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args
index e0bc344f76d686239f98738dcf3a98ca4d667d3d..21b267f1767eaf6e45b417b7af5fced7f1ad1161 100644 (file)
--- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args
index bd07929eec1a395e7b3423b400acdab0a18ba97d..6b59d536b24c0d0a2698048d24952fbe3046489d 100644 (file)
--- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml
index acad600ef8acc493c35c88d410613ae1578ebae2..590cb2cae5abbdaad722c0971e7c579804df8dd6 100644 (file)
--- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml
+++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='lun'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'>

diff --git a/tests/qemuxml2argvdata/disk-virtio.args b/tests/qemuxml2argvdata/disk-virtio.args
index 92230b007b5f176321806d5b0c57ba6c5e7e0ad1..7c217255c23db3c3293ccfb59e2dc88acab75663 100644 (file)
--- a/tests/qemuxml2argvdata/disk-virtio.args
+++ b/tests/qemuxml2argvdata/disk-virtio.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/disk-virtio.xml b/tests/qemuxml2argvdata/disk-virtio.xml
index cefb53d4b255f4003fc79a6b99eb63bd9c9b96fb..0406e9bd758ac9645351f6bf9a85527a0204f7eb 100644 (file)
--- a/tests/qemuxml2argvdata/disk-virtio.xml
+++ b/tests/qemuxml2argvdata/disk-virtio.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/encrypted-disk-usage.args b/tests/qemuxml2argvdata/encrypted-disk-usage.args
index b77375df573067b847eac8feae8695f0da978fe0..4522d2cb84bd1dc0081f93d230c67b405cda9c3d 100644 (file)
--- a/tests/qemuxml2argvdata/encrypted-disk-usage.args
+++ b/tests/qemuxml2argvdata/encrypted-disk-usage.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-encryptdisk/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-encryptdisk/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-encryptdisk/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name encryptdisk \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/encrypted-disk-usage.xml b/tests/qemuxml2argvdata/encrypted-disk-usage.xml
index 205283b59d458448f50a3fd667d15121c0d324ae..9e9f7573801ebc40d989ddbc3621c060d3f35790 100644 (file)
--- a/tests/qemuxml2argvdata/encrypted-disk-usage.xml
+++ b/tests/qemuxml2argvdata/encrypted-disk-usage.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source file='/storage/guest_disks/encryptdisk'/>

diff --git a/tests/qemuxml2argvdata/encrypted-disk.args b/tests/qemuxml2argvdata/encrypted-disk.args
index b77375df573067b847eac8feae8695f0da978fe0..4522d2cb84bd1dc0081f93d230c67b405cda9c3d 100644 (file)
--- a/tests/qemuxml2argvdata/encrypted-disk.args
+++ b/tests/qemuxml2argvdata/encrypted-disk.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-encryptdisk/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-encryptdisk/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-encryptdisk/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name encryptdisk \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/encrypted-disk.xml b/tests/qemuxml2argvdata/encrypted-disk.xml
index 275724bdafc962beb546ef07f850c212bf3a0fb4..e996cde889f7caf994f2efc736c3b4799aeab839 100644 (file)
--- a/tests/qemuxml2argvdata/encrypted-disk.xml
+++ b/tests/qemuxml2argvdata/encrypted-disk.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source file='/storage/guest_disks/encryptdisk'/>

diff --git a/tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args b/tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args
index 5596739288a72a9558df8c8c20082d408fd82faf..fb12878f2edd3de27a6d496f68c5dd1a77c442f9 100644 (file)
--- a/tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args
+++ b/tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args
index 5cd7bb0a150b28d7625f32ca0e93e9e1894f9229..b0a004f3161f1fa93edd28217bcec967b5a45bce 100644 (file)
--- a/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args
+++ b/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args b/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args
index f8119317592a9a74ebf07739441e3332308c2555..2f578da149775c255fba976ce645f7765211be31 100644 (file)
--- a/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/eoi-disabled.xml b/tests/qemuxml2argvdata/eoi-disabled.xml
index 89838bca1b16ca9d30c31ed7410e32b9af7d8b7c..84d81ba2ca5d012fa38a308a46d8219a4e1e6b9e 100644 (file)
--- a/tests/qemuxml2argvdata/eoi-disabled.xml
+++ b/tests/qemuxml2argvdata/eoi-disabled.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>

diff --git a/tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args b/tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args
index 03b3d0558234742601cc6f0aec5b0e328a498943..96bfba2dacffab9f6d9cc83a7fbd6271b8219a5b 100644 (file)
--- a/tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args
+++ b/tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args
index 38e978b399c2d29d44d1211dc2537e0efd6fff4d..b008c779fad0a73d1695b5a01fa1e73cb55efabf 100644 (file)
--- a/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args
+++ b/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args b/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args
index 25c03ae4d27ce64a234fad6f40815fda045338bf..995d7b8d3199ddfcbb1cfca8a5933b0f7bee8a5b 100644 (file)
--- a/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/eoi-enabled.xml b/tests/qemuxml2argvdata/eoi-enabled.xml
index 73167e19ba3e87f4c4b5ec6805c57d6f1eaf8f78..5de74634b018e74373ab1f6dad894835cd103a39 100644 (file)
--- a/tests/qemuxml2argvdata/eoi-enabled.xml
+++ b/tests/qemuxml2argvdata/eoi-enabled.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>

diff --git a/tests/qemuxml2argvdata/fips-enabled.args b/tests/qemuxml2argvdata/fips-enabled.args
index 22bc823b4a086afce64900de3d7b7d5847911c78..91b32bd96ccb1d274157cda8b365d3b9c023ece9 100644 (file)
--- a/tests/qemuxml2argvdata/fips-enabled.args
+++ b/tests/qemuxml2argvdata/fips-enabled.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -enable-fips \

diff --git a/tests/qemuxml2argvdata/fips-enabled.xml b/tests/qemuxml2argvdata/fips-enabled.xml
index 95f2d748dccb06f8a83f774bc40da942505f5d87..359e00929a35173af01a87191e4d1451c8b670c9 100644 (file)
--- a/tests/qemuxml2argvdata/fips-enabled.xml
+++ b/tests/qemuxml2argvdata/fips-enabled.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.args b/tests/qemuxml2argvdata/floppy-drive-fat.args
index 8552073543995ad819b39aeeaa8dd032592b359d..c654ae598aeb4c16ae53f8864abcad7c0395f715 100644 (file)
--- a/tests/qemuxml2argvdata/floppy-drive-fat.args
+++ b/tests/qemuxml2argvdata/floppy-drive-fat.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args
index b3ecac19e6386dbc57afbc7d7f6f0682555610da..90ab4214d9155ae8b00f08c73a04107c56f9d9b0 100644 (file)
--- a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args
index 1bf202659ed92b5b422be7b240bc968a40d144d5..b6da75fa662dfb336d20dcb786ec02a9dd9533d2 100644 (file)
--- a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.xml b/tests/qemuxml2argvdata/floppy-drive-fat.xml
index 7b56bcf9d815a46e48afe9c6880695b58e928bf0..7ec9492ed4b2418fcf03ce0c9cfc6aa9594b98fe 100644 (file)
--- a/tests/qemuxml2argvdata/floppy-drive-fat.xml
+++ b/tests/qemuxml2argvdata/floppy-drive-fat.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='dir' device='floppy'>
       <driver name='qemu' type='fat'/>
       <source dir='/var/somefiles'/>

diff --git a/tests/qemuxml2argvdata/fs9p.args b/tests/qemuxml2argvdata/fs9p.args
index 5b028c7a8097b636a72f006d26078e3c3a6c248b..87bdf4da77c4c68be7c9dc09a22a79e337f5a91a 100644 (file)
--- a/tests/qemuxml2argvdata/fs9p.args
+++ b/tests/qemuxml2argvdata/fs9p.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/fs9p.x86_64-latest.args b/tests/qemuxml2argvdata/fs9p.x86_64-latest.args
index 47b75808176f14b3dbaa057508c1df01a5740d25..cef9c614f75dd53dd58ae8c9bd61286b2ef7f8e3 100644 (file)
--- a/tests/qemuxml2argvdata/fs9p.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/fs9p.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/fs9p.xml b/tests/qemuxml2argvdata/fs9p.xml
index aaa7c466b418aba8d2e86af6ddc8b1d3861fa7f4..9431015de2de93f45dd6fd68e2758df5960ba061 100644 (file)
--- a/tests/qemuxml2argvdata/fs9p.xml
+++ b/tests/qemuxml2argvdata/fs9p.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0' model='none'/>
     <filesystem type='mount'>
       <source dir='/export/to/guest'/>

diff --git a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args
index d7b86e627052b12349874e7f393c0a5f9ea17d24..296aa12b41c0b01b5f6670238714396468dfc14e 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.xml b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.xml
index a8d54e75da9dee956c0241f21a6cc54ea50923ef..d8c8166e3315c26161be467e27e440d3aba93760 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.xml
+++ b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.args b/tests/qemuxml2argvdata/graphics-egl-headless.args
index a15666bff25302a0b39b17709009210a0c956396..76d75834622d468118445bb2efd300e8760ad4fe 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-egl-headless.args
+++ b/tests/qemuxml2argvdata/graphics-egl-headless.args
@@ -6,7 +6,7 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args
index d7b86e627052b12349874e7f393c0a5f9ea17d24..296aa12b41c0b01b5f6670238714396468dfc14e 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.xml b/tests/qemuxml2argvdata/graphics-egl-headless.xml
index 7b001cd2ebffc5436fd6ad104c93b101514ebc4d..9ae377bf04257a9c903196117461964c7bc66916 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-egl-headless.xml
+++ b/tests/qemuxml2argvdata/graphics-egl-headless.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/graphics-listen-network.xml b/tests/qemuxml2argvdata/graphics-listen-network.xml
index d0aaa35824b09eb05c1c796805e71997f44c291e..f96fb01200dcbf0f5769dad0d5a06f87e7f8007e 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-listen-network.xml
+++ b/tests/qemuxml2argvdata/graphics-listen-network.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/graphics-listen-network2.xml b/tests/qemuxml2argvdata/graphics-listen-network2.xml
index 2aa21e3332f57f68870b3db11234507904394340..ede047ac3861ab97c55c1631a5593c2720f2efa6 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-listen-network2.xml
+++ b/tests/qemuxml2argvdata/graphics-listen-network2.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/graphics-sdl-egl-headless.xml b/tests/qemuxml2argvdata/graphics-sdl-egl-headless.xml
index 955dfeb3c2d862e7636f7c23c5d119421cea2c19..04bda90226157a16a54c0334af461cc8084a4e70 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-sdl-egl-headless.xml
+++ b/tests/qemuxml2argvdata/graphics-sdl-egl-headless.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
index 2d01e57ddb71a96372369d7d1d176b8454f68b63..a34f9d43c767ac119f3167b7a0f7dee3f157e709 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
+++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 XAUTHORITY=/root/.Xauthority \
 DISPLAY=:0.1 \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.xml b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.xml
index 2164c74782a6b6f87614704e51719ddf6bc7b553..4c006e171b025027396a1d96b7e661c409a5cd20 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.xml
+++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/graphics-sdl.args b/tests/qemuxml2argvdata/graphics-sdl.args
index ef11a503ce819eb8eccd0c68d7b6f138381991cb..c0c354b824c48cbd88f01d2a64580a08f7377a84 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-sdl.args
+++ b/tests/qemuxml2argvdata/graphics-sdl.args
@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 XAUTHORITY=/root/.Xauthority \
 DISPLAY=:0.1 \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/graphics-sdl.xml b/tests/qemuxml2argvdata/graphics-sdl.xml
index d8c66dff81cad77b904bae9b1e75f557563423ff..79947b715c9ff04bd79c4a50b57a8bc48dbff02f 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-sdl.xml
+++ b/tests/qemuxml2argvdata/graphics-sdl.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
index 756939d43433ad569d5c72660ae0626cff6ebd76..abcebd177402bfa5b0906409dd54ace2c1a13462 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
+++ b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=spice \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.xml b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.xml
index 04b48a6e95bdeb10696f67beca1f84742307a5ea..2ef19b1cf94b43c3c683eeeda2b1fa54e093ba1f 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.xml
+++ b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
index ffb4078ab2d366d7a3c15bd83d9c7ccb78dc9779..9bed3523128d0d02bd3b9ee144039a108add4bf4 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
+++ b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=spice \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/graphics-spice-agentmouse.xml b/tests/qemuxml2argvdata/graphics-spice-agentmouse.xml
index 01778b1ad4aff089703713c4736cd5698f0375f6..f6a28d6d4c50a2ff4ad7c7bb4dd3c8306ec6e580 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-agentmouse.xml
+++ b/tests/qemuxml2argvdata/graphics-spice-agentmouse.xml
@@ -12,7 +12,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
index f377aa35e9643ddf42157051d69f58f67edaf753..843e82935e2a327af9293794026fee2abb1907c6 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
+++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=spice \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.xml b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.xml
index 5ae3b519110bc0d90b4140540ac1b064d58dbcc2..b58e185b3eff0a9f728d870e9ab7a0e7f3c65ce9 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.xml
+++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket.args b/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
index f377aa35e9643ddf42157051d69f58f67edaf753..843e82935e2a327af9293794026fee2abb1907c6 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
+++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=spice \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket.xml b/tests/qemuxml2argvdata/graphics-spice-auto-socket.xml
index 696a32d007694d38c3fed867dfad8ae5aac45495..a8bfa9f3157d947d21720a7be35269dc557e4280 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-auto-socket.xml
+++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/qemuxml2argvdata/graphics-spice-compression.args b/tests/qemuxml2argvdata/graphics-spice-compression.args
index 3a610e5beb818acd88f3394a1da565db4a1d6add..1f06d88e04f48b7b1f07454f717be1ab40db9bfe 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-compression.args
+++ b/tests/qemuxml2argvdata/graphics-spice-compression.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=spice \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/graphics-spice-compression.xml b/tests/qemuxml2argvdata/graphics-spice-compression.xml
index d6683fa486cf4d73d4ac2655ce9d2207c2d4cb61..2d2bae8bc22dc30c0383c5b5a8ab6ec329cf6e52 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-compression.xml
+++ b/tests/qemuxml2argvdata/graphics-spice-compression.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
index bd94af7e1eb87a70c3edf71cbd9cbbaa8f064d01..54b7184376b3ded3c3010c88c1e0f6e34fbf1c4c 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
+++ b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=spice \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/graphics-spice-egl-headless.xml b/tests/qemuxml2argvdata/graphics-spice-egl-headless.xml
index fafae13a0f0e181b9cbed9d3920339c9d4b27be3..dd771dcf3a8b87648721cb1eb81342fecaa61124 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-egl-headless.xml
+++ b/tests/qemuxml2argvdata/graphics-spice-egl-headless.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args
index 00057eb3e560344dd94433e9a8c7b7ca6f5d7d9c..bfe53c041eddf9ce3f6a7f54413d51482f07d564 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=spice \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.xml b/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.xml
index b48e7bc94ec21c3e78ce104fcee88df895d113b8..9e408d105ffae5212e48871336d752a0836f1472 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.xml
+++ b/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='spice' autoport='no'>

diff --git a/tests/qemuxml2argvdata/graphics-spice-invalid-egl-headless.xml b/tests/qemuxml2argvdata/graphics-spice-invalid-egl-headless.xml
index 25ae61cef65f80f0379823e1957a5460b030d45e..39f94c35bbe0ba051272de27d9d1d0339bfa1f74 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-invalid-egl-headless.xml
+++ b/tests/qemuxml2argvdata/graphics-spice-invalid-egl-headless.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/graphics-spice-no-args.args b/tests/qemuxml2argvdata/graphics-spice-no-args.args
index c354f0d8438810de9516306fa358d35004c3aba1..76f74c0fc562c381314f8091103b81f27e3fa64d 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-no-args.args
+++ b/tests/qemuxml2argvdata/graphics-spice-no-args.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=spice \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/graphics-spice-no-args.xml b/tests/qemuxml2argvdata/graphics-spice-no-args.xml
index 7ae1999dd5432ba9256e13ca0614cb29286af849..17685472a8307e4502d9b094d5ba78f9f24b4ef7 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-no-args.xml
+++ b/tests/qemuxml2argvdata/graphics-spice-no-args.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='spice' autoport='no'/>

diff --git a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
index 7f2d3141b9b399c06b57d1338f447f5cceb5d605..630e62018677bb47d37a56c161741a5ebdd962df 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
+++ b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=spice \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.xml b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.xml
index c264a842d14c0fb4041e0257e69d9bea74bf35c1..64c48fcbe1baea9e3d45d8da7e8f2a51eb382b35 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.xml
+++ b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.args b/tests/qemuxml2argvdata/graphics-spice-sasl.args
index 314262787b7c59a96ac6193bd8b3ba383bb08ca6..bc2293d6a07b4e7b1a99a1b48ea8b0d08cb06376 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-sasl.args
+++ b/tests/qemuxml2argvdata/graphics-spice-sasl.args
@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 SASL_CONF_PATH=/root/.sasl2 \
 QEMU_AUDIO_DRV=spice \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.xml b/tests/qemuxml2argvdata/graphics-spice-sasl.xml
index 20471872e32a2e077219b6d417f8df6ac1a75d6a..6b15807402ccc28c39ec0f4991d3d622cb2f185c 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-sasl.xml
+++ b/tests/qemuxml2argvdata/graphics-spice-sasl.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/graphics-spice-socket.args b/tests/qemuxml2argvdata/graphics-spice-socket.args
index eb3e5d48163a5625a9ec2d32b22f4f969c61d2c4..e7813572772bcb6dd40ac21d40a6e5723fb79049 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-socket.args
+++ b/tests/qemuxml2argvdata/graphics-spice-socket.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=spice \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/graphics-spice-socket.xml b/tests/qemuxml2argvdata/graphics-spice-socket.xml
index d80d54326e07ce615baef506ebefd8f714c34ccc..600f2edcc7d74e06206704b8fcfffe1f74a59a53 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-socket.xml
+++ b/tests/qemuxml2argvdata/graphics-spice-socket.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.args b/tests/qemuxml2argvdata/graphics-spice-timeout.args
index 0da6c10ddc4ee49052ad6d293c0eae2b6960de4a..3f6cf4a8e2aeef3184a035a82d7b3b21e7260d65 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-timeout.args
+++ b/tests/qemuxml2argvdata/graphics-spice-timeout.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-f14/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-f14/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-f14/.config \
 QEMU_AUDIO_DRV=spice \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name f14 \
 -S \
 -machine pc,accel=kvm,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.xml b/tests/qemuxml2argvdata/graphics-spice-timeout.xml
index b6714e6518ed60438d99e12eb7c26a36a6ab672d..6bb4eb8f4c3b41bf5bc8b62efe3ec907d850ad8a 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-timeout.xml
+++ b/tests/qemuxml2argvdata/graphics-spice-timeout.xml
@@ -38,7 +38,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source file='/var/lib/libvirt/images/f14.img'/>

diff --git a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args b/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
index 82ed40ded432d475366c2894c2bfd05b34120f74..c46bddf617f34e25f143aa24a81b76bfdb64931b 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
+++ b/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=spice \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/graphics-spice-usb-redir.xml b/tests/qemuxml2argvdata/graphics-spice-usb-redir.xml
index e99d1fdf226d4306901360c9e1b0e7d6297916f7..64a5948b29d2ccf0b6eeeedc74bf1773206eef90 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-usb-redir.xml
+++ b/tests/qemuxml2argvdata/graphics-spice-usb-redir.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <graphics type='spice' port='5903' tlsPort='5904' autoport='no' listen='127.0.0.1'>
       <listen type='address' address='127.0.0.1'/>
       <channel name='main' mode='secure'/>

diff --git a/tests/qemuxml2argvdata/graphics-spice.args b/tests/qemuxml2argvdata/graphics-spice.args
index 723a23001b4a9024c52633ab47e0614409b72860..4c38960b72e7eab3cae6131a712719645eba3e8b 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice.args
+++ b/tests/qemuxml2argvdata/graphics-spice.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=spice \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/graphics-spice.xml b/tests/qemuxml2argvdata/graphics-spice.xml
index 19933bcf2d9508bc4b472cc13299195d7a732997..657b6ccbed801189d99f49be67fafd600a40939f 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice.xml
+++ b/tests/qemuxml2argvdata/graphics-spice.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
index dc82316693bea63451d124002750f5f410b6a2be..5e3bb6e0b5665636fe26a70affe1de8627859d1c 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.xml b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.xml
index 2c0448b6301484f88c4b3f8e24d8ec270c027353..05e2bd9426273e047c7b6546b31768b2d4381d83 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.xml
+++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
index 87dc057688ebd0a6fa1e3240bd577296a93d21cc..12697fc206ea88dea3247b3443104585b5a4b142 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.xml b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.xml
index ba6987a4c4cb5f722a1b5f48ab0a7cffadc1913d..db532dd2036973c045618bb262f8b9ce101d7930 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.xml
+++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
index f50bff03ede2e6f3459152bf85d813fff356a58b..3c0901d1a5a0c6e8ac05231b1f5f2cbfc3eba306 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.xml b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.xml
index 570cf2e50fe2b5b3e10550378930e7dd606e5659..5095d3e7e41d15c8aae862493857337fede8244f 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.xml
+++ b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
index 6edeccb0f8b9e3d2db607198aba161d9937bd063..82a77778c2ef7c82c94b5f7f937225274ff88232 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.xml b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.xml
index 5ca53c7063add806de20b1b397136c00f33e5eac..5600ad408a083a7318b668b976e77ca6c3ceb594 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.xml
+++ b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/graphics-vnc-none.args b/tests/qemuxml2argvdata/graphics-vnc-none.args
index b8fc049d950c59867cf879799464e3ecc26a56a2..f9259c7fe7a5b5612a96c660fa1f415016b6e8ae 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-none.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-none.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-none.xml b/tests/qemuxml2argvdata/graphics-vnc-none.xml
index 20142572cf41faa0ebd8ea6e297497d1edcdefb9..4a18ed3d92cb92969a5c0fa28e277d9cf68028c4 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-none.xml
+++ b/tests/qemuxml2argvdata/graphics-vnc-none.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/qemuxml2argvdata/graphics-vnc-policy.args b/tests/qemuxml2argvdata/graphics-vnc-policy.args
index 7115c5133f667d211a58a2656d35c42db1c09eaa..17fde4e5a1946d276f69023c22904319a3ef8e04 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-policy.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-policy.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-policy.xml b/tests/qemuxml2argvdata/graphics-vnc-policy.xml
index 5a6ab0599e4ebf32c510f947b2f9fd57c13969e4..344f01907929715a92c2b91f64c7993d8ac5dcd4 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-policy.xml
+++ b/tests/qemuxml2argvdata/graphics-vnc-policy.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
index 6200e7132fc5915bcca5d27a2c51ab2897e5110c..7ee7a3777cb008e12e564e07dd426084e2db76f1 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.xml b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.xml
index c6d3f4176d0a2bf966f530dcceccd0d1f816e0fd..5de3160f41725d8a7a4d08042b5dd656cc6718da 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.xml
+++ b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/graphics-vnc-sasl.args b/tests/qemuxml2argvdata/graphics-vnc-sasl.args
index 1bbde63c2e4578df2149c16eff3864a9e7f5c6cc..32972582e79b2bf060659b8937bbc1ee456eaab1 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-sasl.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-sasl.args
@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 SASL_CONF_PATH=/root/.sasl2 \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-sasl.xml b/tests/qemuxml2argvdata/graphics-vnc-sasl.xml
index d0729e830df12a5cbd6c473ffa27c77fdcbf2797..e05045a23c6574dec9c8df4d59bb7bc4e4f18e1d 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-sasl.xml
+++ b/tests/qemuxml2argvdata/graphics-vnc-sasl.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
index 20cb1db45b2176ee8d9f308e43251615a6054234..7b845de69bc8c5bfa39f76db3f91a593b73e41a9 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.xml b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.xml
index 2b9758fecbff7e533490ae1ed58365ecf0c67fea..ab99f4fd139e088a17b83453e6b3eb35eff03bb1 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.xml
+++ b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.xml
@@ -8,7 +8,7 @@
     <type arch='i686' machine='pc'>hvm</type>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <graphics type='vnc'>
       <listen type='socket' socket='/tmp/foo=bar.sock'/>
     </graphics>

diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket.args b/tests/qemuxml2argvdata/graphics-vnc-socket.args
index be7ccfdc18bdbc5d444e0a279770013edf944fc2..8fe87adde836e4768f5e3d76cc1109c3e75b1448 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-socket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-socket.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket.xml b/tests/qemuxml2argvdata/graphics-vnc-socket.xml
index 849ae0095176a0827d2b030753805602a9e3fd8d..fda7fb73640da190b627c9c286b04674e7744306 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-socket.xml
+++ b/tests/qemuxml2argvdata/graphics-vnc-socket.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
index 4180df6b65b33c7d894b04afdf0c2621f11ac194..8bd4f95f7dd1546289588725ad4305084f2403ad 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 SASL_CONF_PATH=/root/.sasl2 \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.xml b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.xml
index 079f6241c49c82546903d22f905118e2e6c6e4a2..df7b3caf7dfbff79ead79c6ad5ce4840389e2821 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.xml
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.args b/tests/qemuxml2argvdata/graphics-vnc-tls.args
index 89cef8d7b60c992edbc3b3c21583e98d6a4ee208..7d89329aa2fe1f97068a925e33bb16f554973cf1 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.args
@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 SASL_CONF_PATH=/root/.sasl2 \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
index a976e5d88cfc67011dd424bb0742eda7bea60541..3ec25996c9dbde24addd3863e8d0929b89645ed7 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 SASL_CONF_PATH=/root/.sasl2 \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc-i440fx-2.4,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
index 78579e4dc26ca55b0c6239d027091b2c2b72761d..dcfbb4b658ac7f310fd712b9d4709d892025d4a6 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 SASL_CONF_PATH=/root/.sasl2 \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.xml b/tests/qemuxml2argvdata/graphics-vnc-tls.xml
index 079f6241c49c82546903d22f905118e2e6c6e4a2..df7b3caf7dfbff79ead79c6ad5ce4840389e2821 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.xml
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/qemuxml2argvdata/graphics-vnc-websocket.args b/tests/qemuxml2argvdata/graphics-vnc-websocket.args
index 4d9531a8d69610aa908d72bfb040831344785687..c094c0d0f07927b486abd2dc3a0511d1472a8ba2 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-websocket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-websocket.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-websocket.xml b/tests/qemuxml2argvdata/graphics-vnc-websocket.xml
index c5c507c8ec3b9070d9d1b119ef3b3573838d3bb2..cca3392f828edf52cf92479c800d3f73f8a2cab8 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-websocket.xml
+++ b/tests/qemuxml2argvdata/graphics-vnc-websocket.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>

diff --git a/tests/qemuxml2argvdata/graphics-vnc.args b/tests/qemuxml2argvdata/graphics-vnc.args
index 6edeccb0f8b9e3d2db607198aba161d9937bd063..82a77778c2ef7c82c94b5f7f937225274ff88232 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc.args
+++ b/tests/qemuxml2argvdata/graphics-vnc.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/graphics-vnc.xml b/tests/qemuxml2argvdata/graphics-vnc.xml
index f9994703d25f0594596fecd648b3b836c04f8dfb..aa0edbaebc4b2b6df0bc6b2a932eee1cfefbbd04 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc.xml
+++ b/tests/qemuxml2argvdata/graphics-vnc.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.xml b/tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.xml
index 55b60ba1333431f2eafd7634c1088cd63d3ca4e9..0a78309c991b187ccfa949d4ba1ae3043c0705f5 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.xml
+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args
index 30d2f83318d41c20661017df0104bba6f7a34b3b..f7949a9e7db05e0100035bab73e4d282ede9f9a9 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest2,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.xml b/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.xml
index 2e7851b2b0d311fd627bccc59a7767c028c96246..6fdc477ca23163fe734f9452a248015580585598 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.xml
+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args
index d15ffa6dc40ae61fdc871e27747fa87594b3ac38..0c7737712c5ed4c538a35d4c1bfcbe467639529e 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
 QEMU_AUDIO_DRV=spice \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest2,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.xml b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.xml
index 3a686ad2bf718c9bad5beac513c3888144a9fe43..fc73dac562646473f074f8ca9cc474c04ce063cf 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.xml
+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args
index 5bda70c8e2cf6b2ab857d390a03b351d523ecf3f..d861c96404b97e929b23b9eb30cf29b1c5e8707a 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
 QEMU_AUDIO_DRV=spice \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest2,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.xml b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.xml
index a632e58a41ee5424aed8c2d9264924cf0e963553..db92bb98c345d09a2bf7cc238729c9571b59b03f 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.xml
+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args
index 9c5060cdb0f44091561c455eab74cdd5aeb2000b..e616aee5701731a11f5f85281e6625f25b0441c2 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest2,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.xml b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.xml
index ddcf617692ae4d008516a3446dddedf4e646021b..940fddae05ebf0e1ab481592c3d410f80181c73f 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.xml
+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args
index d8ba56814544345b6383189370ae270cdf670e9e..8831636938b3079b97972a590de1dfae5d6631fc 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest2,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.xml b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.xml
index a70f5068658fe60857da93306aba8752494c187b..6c9fc419ac23a3cac003a9f53fb563fb0c76d7c3 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.xml
+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display.xml b/tests/qemuxml2argvdata/hostdev-mdev-display.xml
index ac4e9a7eaa7500521a8c48c65df6d0091218b87d..e24ca7dc906c45348715101f1afb1e7fde6c0b65 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-mdev-display.xml
+++ b/tests/qemuxml2argvdata/hostdev-mdev-display.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/qemuxml2argvdata/hostdev-mdev-invalid-target-address.xml b/tests/qemuxml2argvdata/hostdev-mdev-invalid-target-address.xml
index a5c10b84019d18c572fb98a50deaab2a7460a560..2c899738e2329a2aa9e87074d7227778eaecd735 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-mdev-invalid-target-address.xml
+++ b/tests/qemuxml2argvdata/hostdev-mdev-invalid-target-address.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
index c6dac47a18045d520b5088bfda4b14b56508755b..207ac5740bf99a953d5b7977ffa2608a992eb7e8 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest2 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.xml b/tests/qemuxml2argvdata/hostdev-mdev-precreated.xml
index a525b23550aed77a04de4a482aa7c52527f38331..4b198c29a6d2cba731707a5d0949be160041a62e 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.xml
+++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/qemuxml2argvdata/hostdev-mdev-src-address-invalid.xml b/tests/qemuxml2argvdata/hostdev-mdev-src-address-invalid.xml
index 6a321c8a4297708773334df88115797cc92e1012..81740baa0018058605bebb3745ab2d8ce0adf347 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-mdev-src-address-invalid.xml
+++ b/tests/qemuxml2argvdata/hostdev-mdev-src-address-invalid.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-device.args b/tests/qemuxml2argvdata/hostdev-pci-address-device.args
index 79654f44bb1b161b9f1c53f62b4db7d53c375a09..98d4a62c180e2b1c2d7fb868afe12a5da9eca64d 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-pci-address-device.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-address-device.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest2 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-device.xml b/tests/qemuxml2argvdata/hostdev-pci-address-device.xml
index 814fdcc2711be884ec3e7b463eb57584400fb74f..7a99fc84446398e268081abcc63f53d0aaab3cdf 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-pci-address-device.xml
+++ b/tests/qemuxml2argvdata/hostdev-pci-address-device.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest2'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/hostdev-pci-address.args b/tests/qemuxml2argvdata/hostdev-pci-address.args
index 0a57a8f29e0d26e4c5f753ac9e87fa1201d275e4..edec271444766c995d8ba5027d7ae71921398dac 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-pci-address.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-address.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest2 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/hostdev-pci-address.xml b/tests/qemuxml2argvdata/hostdev-pci-address.xml
index 17968350ff3d2fe0daf25461fa60da94c28f5ee3..5f8090336f2958737d272bbd58e2a410cdef5403 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-pci-address.xml
+++ b/tests/qemuxml2argvdata/hostdev-pci-address.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest2'/>

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-autogen-address.xml b/tests/qemuxml2argvdata/hostdev-scsi-autogen-address.xml
index 6f8cf56ae7e41e00f64f037df3860ee3eb308cf5..22eb515cbbfccbcf59eac336e119e1e6aafdcaee 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-autogen-address.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-autogen-address.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest2'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-boot.xml b/tests/qemuxml2argvdata/hostdev-scsi-boot.xml
index 13e159be8e81fb883e8ee08070e40ea04c2e3a60..8762f57c2b8cd404fa363221aa112132bf0fe8b9 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-boot.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-boot.xml
@@ -12,7 +12,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest2'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-large-unit.xml b/tests/qemuxml2argvdata/hostdev-scsi-large-unit.xml
index 8c654c4b2326ee0b05b381bc1dfc47b42e4bb107..046563211e2f3afaa3a1f8265eafbf1752c51b46 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-large-unit.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-large-unit.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest2'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args
index 45c76cf55d4e8add6fc77e499192f4dc906d22c3..03e77517b4830bdb6adfe45b8484fc79cb176090 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest2 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.xml b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.xml
index d39885bb01c1880df26f303aba3770106679d4cc..439aa05db02247efd4115b7e6d78373763b33bc5 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest2'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args
index 3d4d42e8f190f1294da8d20179a5a4bc7f725521..f215fba0666cc35258fac4d06914a2d61859c0a5 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest2 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.xml b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.xml
index d84d0b3e2631c5f25a5a28a12f2624695fd98afb..85885aad8dac09ee5dce2e48a99d4a0211d12ec4 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest2'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.args b/tests/qemuxml2argvdata/hostdev-scsi-lsi.args
index 48dc03ac0ae10087f43c5d2f0919af86e80420e7..cf90224e9ad76cdb0eb1c5b75c6c2d0e8db3db46 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest2 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.xml b/tests/qemuxml2argvdata/hostdev-scsi-lsi.xml
index df4777c4c1f34ed413d7ad3f038c9cfdecdf7907..34c41e3fe61d63a97d5cc17dbf5337fb3c2dfc77 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest2'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-rawio.xml b/tests/qemuxml2argvdata/hostdev-scsi-rawio.xml
index 2ece5949f954289c22be92602f760790708cb54a..eb60e550f0dd3c2b72fcc6fe58d3dcab399aa978 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-rawio.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-rawio.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest2'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-readonly.args b/tests/qemuxml2argvdata/hostdev-scsi-readonly.args
index 7b8b87b6594fea6306e3b343511b97b79410f5e3..0e481e7464736afb76157181414385106f0ef5e6 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-readonly.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-readonly.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest2 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-readonly.xml b/tests/qemuxml2argvdata/hostdev-scsi-readonly.xml
index 1cdf5625ce0509bf00e7fe0960fcf40560689597..2e70edd6400863d9adbb60c563c74c99e5c18d67 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-readonly.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-readonly.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest2'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-sgio.xml b/tests/qemuxml2argvdata/hostdev-scsi-sgio.xml
index bad2ceb1f70fa0f79aceabc136620c2bb23af105..bfc53468074e29b74f2659b812bf95fa0a500e87 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-sgio.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-sgio.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest2'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-shareable.xml b/tests/qemuxml2argvdata/hostdev-scsi-shareable.xml
index 3b176a26c36f9016beb301b483d7223169d38901..991f75fb26ff8c2e54818e0c9f374ea94765c2b8 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-shareable.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-shareable.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest2'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci-boot-fail.xml b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci-boot-fail.xml
index 94f590b11b921177c2cb8f8e8735d58d8bdbf574..da67520bfb4f25520683897755ac578ff0a9312f 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci-boot-fail.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci-boot-fail.xml
@@ -12,7 +12,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest2'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
index d07fb3db5fbc1068e25263316fc07f6af9e3ef25..3e8b590ea01351f6baf1fa373201c8335b0a19ea 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest2 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.xml b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.xml
index 13455f672e2b44672df90f754ac462c48194851d..6e2f3da5c16200bdcca0ebae51d60e1e65aa5595 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest2'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args
index ca70730ce762728c76ff9dd4753ba63e547b02c5..4ce2029adb7e9039a04a6a5e5cb71919f0988afc 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest2 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.xml b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.xml
index 0f63f98872a121bb7ca700dae7e61f4946b81abe..388cd63314f668f21f83997ab6ff299d3a66a88a 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest2'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args
index ab03327cef697c5e4ee8b4fb1ff5808fc989e9cd..050e74a449d3353022584c6a86b9b2a1228e2726 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest2 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.xml b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.xml
index 9a457db497abd8bd873a952ad7fa52049992a1ce..88684c9405407481fe1c6ed2c5822d8c1437ddb9 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest2'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args
index 93c315b08d1a2eda39423166695f3d44a1a1d173..364c4a10a58e284ca788bde40188092fdfb29bf0 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest2 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml
index aa56cac064ca87c0145e15315ad574a8f013d037..0fe01de1abd6e9c2df998ef544af7f0b22c7e8fa 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest2'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
index ec23a30bc1e8b10e8b1027b55d3b1e6799314019..6a24db3aea67347bee9007ec552ae45e96b23d09 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.xml b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.xml
index 8fd6720c7ae0ce79a2ac1b98995a36021834a1d3..ac1360f87f440033b60c52fd5fb417a79f494c14 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.xml
+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.xml
@@ -12,7 +12,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device.args b/tests/qemuxml2argvdata/hostdev-usb-address-device.args
index e42c39886d2f0c1ab2b4d70761907da8a58d2ded..5a10d45b3b1a983951865b505480e678414a6079 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-usb-address-device.args
+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device.xml b/tests/qemuxml2argvdata/hostdev-usb-address-device.xml
index 0fe6d636180161fdf019482f57234cca5d1d3739..90275645841af135803b3b816a70bf49ea75513f 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-usb-address-device.xml
+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/hostdev-usb-address.args b/tests/qemuxml2argvdata/hostdev-usb-address.args
index f6ad4f6ffcf95d667f98275333324fa7c0fa5d50..eb179114230d1bc84092c99ebd5ca9f0b7e4e6b4 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-usb-address.args
+++ b/tests/qemuxml2argvdata/hostdev-usb-address.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/hostdev-usb-address.xml b/tests/qemuxml2argvdata/hostdev-usb-address.xml
index 9deb2a64afb7ea1df91b7303780d82d1688daa33..7d0c338311a04d41d399da014c74bfc779048032 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-usb-address.xml
+++ b/tests/qemuxml2argvdata/hostdev-usb-address.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
index 959d2a888880a355df42eb52c00e6e76746f3125..6bf3ef802160df7f0183d951e9072f6f12d4b321 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest2 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.xml b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.xml
index 7c34b65c7f00da1ac3548004f44de6524bd73262..e894e1577ff1eb3af82847c15175371e66b0b685 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.xml
+++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest2'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.xml b/tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.xml
index bfb2f83a3ba9d29f7b0d8d467448726c1480cce0..521ebcf802f4de5b1cd63e62e95485e50298138a 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.xml
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest2'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/hostdev-vfio.args b/tests/qemuxml2argvdata/hostdev-vfio.args
index f2025afcd473ff5674526c62d1eb58984e02fc07..d7eaa774cab34c6dfb89f24b8a811d6a14bcd094 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-vfio.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest2 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/hostdev-vfio.xml b/tests/qemuxml2argvdata/hostdev-vfio.xml
index b2e6c62e7e368fdb4babe01f4892e628da073ce3..e32ee972ba4666cb310cab4a621959fc7efa1b87 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-vfio.xml
+++ b/tests/qemuxml2argvdata/hostdev-vfio.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest2'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/hostdevs-drive-address-conflict.xml b/tests/qemuxml2argvdata/hostdevs-drive-address-conflict.xml
index c78c1be95919db3a2d3954fe6cf57946bb690389..509319b3ea848964b2347ea0dbab82f2d9346517 100644 (file)
--- a/tests/qemuxml2argvdata/hostdevs-drive-address-conflict.xml
+++ b/tests/qemuxml2argvdata/hostdevs-drive-address-conflict.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <hostdev mode='subsystem' type='scsi' managed='no'>
       <source>
         <adapter name='scsi_host2'/>

diff --git a/tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.xml b/tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.xml
index eb0943b10559582a9c12565812253ccd55bf706b..49cd2c827aedc3a7e76929f7f305bbef44a252b9 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.xml
+++ b/tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2argvdata/hugepages-default-2M.args b/tests/qemuxml2argvdata/hugepages-default-2M.args
index f4cdf71cb0a53fb9ecc202fe37bf7d2f88bc7989..014d71c9ec4a90cf2e3628ba29025914121eceee 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-default-2M.args
+++ b/tests/qemuxml2argvdata/hugepages-default-2M.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name SomeDummyHugepagesGuest \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/hugepages-default-2M.xml b/tests/qemuxml2argvdata/hugepages-default-2M.xml
index ac219a7800bc8f9576e4fb68396552c79455f3c6..ce67853f267904f8f25a1187e6a217cea9167107 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-default-2M.xml
+++ b/tests/qemuxml2argvdata/hugepages-default-2M.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2argvdata/hugepages-default-system-size.args b/tests/qemuxml2argvdata/hugepages-default-system-size.args
index c650e12830f53b84145e174c1f89f4f22603621c..bcf6e6bf0e311ae99fd1db31c81a3160c5fd682b 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-default-system-size.args
+++ b/tests/qemuxml2argvdata/hugepages-default-system-size.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name SomeDummyHugepagesGuest \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/hugepages-default-system-size.xml b/tests/qemuxml2argvdata/hugepages-default-system-size.xml
index 8a809ead5e9853636ecfd7067a5100dcbcb2ea53..5beeffed9cd77f50f44e3b9c9c151d17a7d68f52 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-default-system-size.xml
+++ b/tests/qemuxml2argvdata/hugepages-default-system-size.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2argvdata/hugepages-default.args b/tests/qemuxml2argvdata/hugepages-default.args
index eda90426c63a712799623d3d212ec508e29c0c6b..3184e4ea07acf7538faf6d4e38d10d3305bc8cd8 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-default.args
+++ b/tests/qemuxml2argvdata/hugepages-default.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/hugepages-default.xml b/tests/qemuxml2argvdata/hugepages-default.xml
index 99f53828fe68d3aab5f797c5c22246dfa628d7b7..18508b381f031d1da8e4397866f08b5866adb5c8 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-default.xml
+++ b/tests/qemuxml2argvdata/hugepages-default.xml
@@ -16,7 +16,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/qemuxml2argvdata/hugepages-memaccess-invalid.xml b/tests/qemuxml2argvdata/hugepages-memaccess-invalid.xml
index 418d42ed6016258d590defbccd27cbc496cddb96..ddd4a6df925c15b0014fdd4e9c32d0f4b63deba2 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-memaccess-invalid.xml
+++ b/tests/qemuxml2argvdata/hugepages-memaccess-invalid.xml
@@ -31,7 +31,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.args b/tests/qemuxml2argvdata/hugepages-memaccess.args
index 861556abf6df4b052a6e7eae6d07d16392cdc84a..7cfbce7c7c6e9bc5a15a146569ef7dc617c9240a 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-memaccess.args
+++ b/tests/qemuxml2argvdata/hugepages-memaccess.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.xml b/tests/qemuxml2argvdata/hugepages-memaccess.xml
index cd75440254e08d0fd99d2adb0a52d448eabbb5e8..68ef57261661016deb1bbbe240e53a4b19968496 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-memaccess.xml
+++ b/tests/qemuxml2argvdata/hugepages-memaccess.xml
@@ -33,7 +33,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.args b/tests/qemuxml2argvdata/hugepages-memaccess2.args
index 66146a20ee2fb8d17d5936e1334e6a5f11845a96..654baebf9f433ece64c8efb06691d2b20607796e 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-memaccess2.args
+++ b/tests/qemuxml2argvdata/hugepages-memaccess2.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.xml b/tests/qemuxml2argvdata/hugepages-memaccess2.xml
index 205f9efd92cb76c79f5de97fe5f4663b39143ec7..c7652847faaa54ffe21f9f7874284b1c886a2535 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-memaccess2.xml
+++ b/tests/qemuxml2argvdata/hugepages-memaccess2.xml
@@ -33,7 +33,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/hugepages-nodeset-nonexist.xml b/tests/qemuxml2argvdata/hugepages-nodeset-nonexist.xml
index 477d3f1f2b3f9e3f04ec07d41939093d6d696c91..e082725844842a480ab7e0ae209c8caf1025fd2d 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-nodeset-nonexist.xml
+++ b/tests/qemuxml2argvdata/hugepages-nodeset-nonexist.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2argvdata/hugepages-nodeset.args b/tests/qemuxml2argvdata/hugepages-nodeset.args
index f4cdf71cb0a53fb9ecc202fe37bf7d2f88bc7989..014d71c9ec4a90cf2e3628ba29025914121eceee 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-nodeset.args
+++ b/tests/qemuxml2argvdata/hugepages-nodeset.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name SomeDummyHugepagesGuest \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/hugepages-nodeset.xml b/tests/qemuxml2argvdata/hugepages-nodeset.xml
index 4a85ddffad04f0a2203991c2fae02ef1dbe67f46..6aae88741cd6774e0da3139c8aa0d87e53796d95 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-nodeset.xml
+++ b/tests/qemuxml2argvdata/hugepages-nodeset.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-2M.args b/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
index 6e8146c895d27c15c62ae86eed0ed7ccad10dad1..bbf3c9f67a906d1424662a36f8c615985d52671e 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name SomeDummyHugepagesGuest \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-2M.xml b/tests/qemuxml2argvdata/hugepages-numa-default-2M.xml
index 357c77da2a600853099450a3670a1b369aed9967..87811aaf4bededb6ac8d7389679b5322b0e69efd 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-numa-default-2M.xml
+++ b/tests/qemuxml2argvdata/hugepages-numa-default-2M.xml
@@ -24,7 +24,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>

diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.xml b/tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.xml
index 8211d72be9cc0c654c86c3fd4e9077f0af58b078..eed8922071330b7d5d0a8371de667bd5f0c3beb3 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.xml
+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.xml
@@ -27,7 +27,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
index aa3fd0a7c99c700dfb6f0c5e3e9baaca165090cc..7849143e69f34ab1b05f4a82399ee0e06af4fd57 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name SomeDummyHugepagesGuest \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.xml b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.xml
index b19bdedb365f918d4ce7cbe3213dc777707d798e..6c0eb24c98ad195e794ae17d4bd334644b0f7a32 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.xml
+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.xml
@@ -24,7 +24,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>

diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args b/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
index 87893ca56f002e1869331c8187fc6dec3935b72c..7b510be6b384d68bb92333058f0dfc0f2107636c 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset.xml b/tests/qemuxml2argvdata/hugepages-numa-nodeset.xml
index e81fa44d58b2477329346dcfcec4185a2961c4a5..00d390dc20fa40d87c65e0a60227047b960b2fca 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-numa-nodeset.xml
+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset.xml
@@ -27,7 +27,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>

diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args
index 7f0a93cee44777603fda977eef77bae96da9dfa9..9056e56cb7b81803c3918427b7cc9818ddc41b5b 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.xml b/tests/qemuxml2argvdata/hugepages-nvdimm.xml
index babb3a6179e77e52149078100db3a0bd0e4b0e6b..b78477780566a65e5e1b3ee377dbf85aabff85a9 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-nvdimm.xml
+++ b/tests/qemuxml2argvdata/hugepages-nvdimm.xml
@@ -26,7 +26,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2argvdata/hugepages-shared.args b/tests/qemuxml2argvdata/hugepages-shared.args
index 1b48fec3a0b1c14de8c1964470e4a14fabdb9fbf..545b86b2232ffde2b7fa19c15daf5f79c370e76f 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-shared.args
+++ b/tests/qemuxml2argvdata/hugepages-shared.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/hugepages-shared.xml b/tests/qemuxml2argvdata/hugepages-shared.xml
index 4902ce6f20a526b61f1ff790f6a57a3c4d00a1ad..462ca8a5ae3acaaef5506985710fde69a336090b 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-shared.xml
+++ b/tests/qemuxml2argvdata/hugepages-shared.xml
@@ -31,7 +31,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args b/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args
index d99bfb4d4ed05683d37e55ab1c2aff75baa6f12d..6909b71d527786b2a07e0c3d6377e09144a636da 100644 (file)
--- a/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args
+++ b/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args b/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args
index 52f7473e144e4f99d484fd735266a722424387e4..fc2429741b14ed6ab7f8fd22f7e6f72ec33ea77b 100644 (file)
--- a/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/hyperv-off.xml b/tests/qemuxml2argvdata/hyperv-off.xml
index 59c1e17ccd369ffbf011c7849598ca8386110769..b22090ac9b11811d09d2f6a91a093ba51448797c 100644 (file)
--- a/tests/qemuxml2argvdata/hyperv-off.xml
+++ b/tests/qemuxml2argvdata/hyperv-off.xml
@@ -32,7 +32,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>

diff --git a/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args b/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args
index 5a16ac97ee188b810fc3a1af7d0eb6174ff383c4..55e509971731ff3bffa92d56c5e315b95adbc397 100644 (file)
--- a/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args
+++ b/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args b/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args
index c92df8b79f091aa7445c196de8b91c309e98e213..7eab402eaf7a4fe6cd57e032041f7d3573f6398d 100644 (file)
--- a/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/hyperv-panic.xml b/tests/qemuxml2argvdata/hyperv-panic.xml
index 9497c96e2b844251137cf785b0f51c4d8176b526..f9b38de001ebfa1492caca862d9d5dabd6002922 100644 (file)
--- a/tests/qemuxml2argvdata/hyperv-panic.xml
+++ b/tests/qemuxml2argvdata/hyperv-panic.xml
@@ -16,7 +16,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>

diff --git a/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args b/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args
index 34e27c75f0f24b4a03b7f88e6e5d4d64c0bb2aae..4aa78bc98f650cf97e933e121c16526a67a0e640 100644 (file)
--- a/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/hyperv-stimer-direct.xml b/tests/qemuxml2argvdata/hyperv-stimer-direct.xml
index 9c865f5746ef0bc50653c720187dba3dc7b6cf8b..44525ef52a41fbca6da273b254cc43de7a74c5a0 100644 (file)
--- a/tests/qemuxml2argvdata/hyperv-stimer-direct.xml
+++ b/tests/qemuxml2argvdata/hyperv-stimer-direct.xml
@@ -23,7 +23,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>

diff --git a/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args b/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args
index 7966cebdc1da03f9d890b8955ecd3482e7a6acd0..b9d9542892f7fc27bd934c33fc91627ade2de02b 100644 (file)
--- a/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args
+++ b/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/hyperv.x86_64-latest.args b/tests/qemuxml2argvdata/hyperv.x86_64-latest.args
index 33c70bb7e7358e64f708a73764ea9b6a4ed33605..f30438dd916a0da0132e9cd8946e275246b2ccf9 100644 (file)
--- a/tests/qemuxml2argvdata/hyperv.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hyperv.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/hyperv.xml b/tests/qemuxml2argvdata/hyperv.xml
index c6feaed5287aa22b99d4b907e6474fa773c02a36..45e460f7dee18d9284430a945d0e6f091ce54ea9 100644 (file)
--- a/tests/qemuxml2argvdata/hyperv.xml
+++ b/tests/qemuxml2argvdata/hyperv.xml
@@ -32,7 +32,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>

diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.args b/tests/qemuxml2argvdata/input-usbmouse-addr.args
index 28472f32cdb6362c3e96dc61204f21a2c139487a..36d9fc4f9006401a16d010bade1b23258c38c47b 100644 (file)
--- a/tests/qemuxml2argvdata/input-usbmouse-addr.args
+++ b/tests/qemuxml2argvdata/input-usbmouse-addr.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.xml b/tests/qemuxml2argvdata/input-usbmouse-addr.xml
index b2fb3a480fa0a47416ea10e69592b382ee03985b..2e6cca6c51e07572de1224a92f099e925454b455 100644 (file)
--- a/tests/qemuxml2argvdata/input-usbmouse-addr.xml
+++ b/tests/qemuxml2argvdata/input-usbmouse-addr.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/input-usbmouse.args b/tests/qemuxml2argvdata/input-usbmouse.args
index 23505ff31cc697b8bcac0fec909e57b2b9172582..fc83eef3aa5907e9ea8ec0b73c3c9ecb02027046 100644 (file)
--- a/tests/qemuxml2argvdata/input-usbmouse.args
+++ b/tests/qemuxml2argvdata/input-usbmouse.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/input-usbmouse.xml b/tests/qemuxml2argvdata/input-usbmouse.xml
index 69bb2032f213dac30cf84824e7591cbedf9bb0c4..533029f352a166a748dc6fd64ddb65cb4c88b0cf 100644 (file)
--- a/tests/qemuxml2argvdata/input-usbmouse.xml
+++ b/tests/qemuxml2argvdata/input-usbmouse.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/input-usbtablet.args b/tests/qemuxml2argvdata/input-usbtablet.args
index c10b57d8ac5b4fb45d6de0742e8280ea0abdbc4f..8a96f664115e67bd915ac60eaa3ce59db093cccf 100644 (file)
--- a/tests/qemuxml2argvdata/input-usbtablet.args
+++ b/tests/qemuxml2argvdata/input-usbtablet.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/input-usbtablet.xml b/tests/qemuxml2argvdata/input-usbtablet.xml
index 5f0ad8d832529ab078e4b6f521e622276f6cdece..59ac2d35fb32e0ad3f790768de8f8a8b29d7eeda 100644 (file)
--- a/tests/qemuxml2argvdata/input-usbtablet.xml
+++ b/tests/qemuxml2argvdata/input-usbtablet.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/iothreads-disk.args b/tests/qemuxml2argvdata/iothreads-disk.args
index 1587342ac3e7712a39fa576c1a10bb565490c837..e3dcb1d1b38ee5a0756bcd0302aa10ea38e2d3d6 100644 (file)
--- a/tests/qemuxml2argvdata/iothreads-disk.args
+++ b/tests/qemuxml2argvdata/iothreads-disk.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/iothreads-disk.xml b/tests/qemuxml2argvdata/iothreads-disk.xml
index 0aa32c392300c0a86ad26185292ebc7a0d85d588..bbfac34db59f624377ed82fb66e9218e995aafec 100644 (file)
--- a/tests/qemuxml2argvdata/iothreads-disk.xml
+++ b/tests/qemuxml2argvdata/iothreads-disk.xml
@@ -14,7 +14,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/iothreads-ids-partial.args b/tests/qemuxml2argvdata/iothreads-ids-partial.args
index 10a68dfb72bd0c80d197559b0f449466972e6099..58e764d78a259302ba0a9ed3a10494f65d8a9f5d 100644 (file)
--- a/tests/qemuxml2argvdata/iothreads-ids-partial.args
+++ b/tests/qemuxml2argvdata/iothreads-ids-partial.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/iothreads-ids-partial.xml b/tests/qemuxml2argvdata/iothreads-ids-partial.xml
index 1d3c267f900cb4c97d27f8e173da2f96e162c785..25069acf80d0180b33df8522580801cc7ed37e88 100644 (file)
--- a/tests/qemuxml2argvdata/iothreads-ids-partial.xml
+++ b/tests/qemuxml2argvdata/iothreads-ids-partial.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/iothreads-ids.args b/tests/qemuxml2argvdata/iothreads-ids.args
index 3b90e18be96a7926e8ca161b0d3f83e841cb8a44..009dcc9d72291fc257751b044ac4c0bfe263249b 100644 (file)
--- a/tests/qemuxml2argvdata/iothreads-ids.args
+++ b/tests/qemuxml2argvdata/iothreads-ids.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/iothreads-ids.xml b/tests/qemuxml2argvdata/iothreads-ids.xml
index d662d6a4997675c311f55a81cdab63fc9771a62b..d41a07efa5ccd206d4a7bc33ea231dbb8ae1446f 100644 (file)
--- a/tests/qemuxml2argvdata/iothreads-ids.xml
+++ b/tests/qemuxml2argvdata/iothreads-ids.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/iothreads-nocap.xml b/tests/qemuxml2argvdata/iothreads-nocap.xml
index d2b1829b315dceedd17da515aa53df127f6ad3c4..fa04d735cdc484339cd9a53310cf98c37797a23d 100644 (file)
--- a/tests/qemuxml2argvdata/iothreads-nocap.xml
+++ b/tests/qemuxml2argvdata/iothreads-nocap.xml
@@ -22,7 +22,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args
index df4c565a17bef83d4c987a7c19a8c3201ef2280c..8785f0bb44ccf6d66fc0c2396186fe3487aa78fe 100644 (file)
--- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.xml b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.xml
index e2bc297873d04881b261799214fd01cc2d5abbbf..bbbbd2439f05441999ff322ea1d132a304e78699 100644 (file)
--- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.xml
+++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.xml
@@ -14,7 +14,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/iothreads.args b/tests/qemuxml2argvdata/iothreads.args
index 37a90b58c35d020fa9003839981cd52ff9d0c924..5bc2350741b323ea825670eb83d72b1fc1972ca2 100644 (file)
--- a/tests/qemuxml2argvdata/iothreads.args
+++ b/tests/qemuxml2argvdata/iothreads.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/iothreads.xml b/tests/qemuxml2argvdata/iothreads.xml
index ce67c384bdb09d7c75c0cb3ad9293e3277f8df69..1c860ddd255f88fcd328c6e39d75c71e58a5cc93 100644 (file)
--- a/tests/qemuxml2argvdata/iothreads.xml
+++ b/tests/qemuxml2argvdata/iothreads.xml
@@ -14,7 +14,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/kvm-features-off.args b/tests/qemuxml2argvdata/kvm-features-off.args
index 59a79376d14030e2fb7023c57165d64e0f93fc1f..54d166912ec6cd99798258f034edc4f0b92ed78f 100644 (file)
--- a/tests/qemuxml2argvdata/kvm-features-off.args
+++ b/tests/qemuxml2argvdata/kvm-features-off.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/kvm-features-off.xml b/tests/qemuxml2argvdata/kvm-features-off.xml
index ab2c16202c3d3c15be97d04760001ecb16608cdb..21d492c8b973b253dc2dc781ece3abf0d465d5b8 100644 (file)
--- a/tests/qemuxml2argvdata/kvm-features-off.xml
+++ b/tests/qemuxml2argvdata/kvm-features-off.xml
@@ -20,7 +20,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>

diff --git a/tests/qemuxml2argvdata/kvm-features.args b/tests/qemuxml2argvdata/kvm-features.args
index 8372ca897d8dae2f8bb1ad3f32cc4eebba1e68f3..5753a3eb3f2ffb9af1dbf012ce40fbda1cc6c1e2 100644 (file)
--- a/tests/qemuxml2argvdata/kvm-features.args
+++ b/tests/qemuxml2argvdata/kvm-features.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=kvm,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/kvm-features.xml b/tests/qemuxml2argvdata/kvm-features.xml
index b942e89a928061aebe2b67dab9d3c114e8f9aaec..85f74786c9fc145838d70f5189bbadb9cf10be92 100644 (file)
--- a/tests/qemuxml2argvdata/kvm-features.xml
+++ b/tests/qemuxml2argvdata/kvm-features.xml
@@ -21,7 +21,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>

diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.args b/tests/qemuxml2argvdata/kvm-pit-delay.args
index c26b7b3de464403861ba9f3ab51f04f74cb2d0e3..f51fb19f858b0a5165c669628f1cf18ddd50326b 100644 (file)
--- a/tests/qemuxml2argvdata/kvm-pit-delay.args
+++ b/tests/qemuxml2argvdata/kvm-pit-delay.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.xml b/tests/qemuxml2argvdata/kvm-pit-delay.xml
index 1541f8f05f96681b1e647495f3a549ace1f423c0..3b5b6d05dd1705e91b8761ddeca082dfb33450d7 100644 (file)
--- a/tests/qemuxml2argvdata/kvm-pit-delay.xml
+++ b/tests/qemuxml2argvdata/kvm-pit-delay.xml
@@ -15,7 +15,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.args b/tests/qemuxml2argvdata/kvm-pit-discard.args
index 23658d954b6d762639ac4752649a9c06a23b0818..a71d9d68b8776a3ca75afeca5abe02e8437bca1c 100644 (file)
--- a/tests/qemuxml2argvdata/kvm-pit-discard.args
+++ b/tests/qemuxml2argvdata/kvm-pit-discard.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.xml b/tests/qemuxml2argvdata/kvm-pit-discard.xml
index 3aff9fef6a6d2eb7d12436cd83c1cd964bd65ec2..0af4b571069b18aa8c9108d70fee3a4aab1f1840 100644 (file)
--- a/tests/qemuxml2argvdata/kvm-pit-discard.xml
+++ b/tests/qemuxml2argvdata/kvm-pit-discard.xml
@@ -15,7 +15,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args
index 1a566358c0df516dc7d93a9e2eff0bb1057d93f0..cb2eba75ff8ba0da15f9048fed68fb09fa7b809c 100644 (file)
--- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args
+++ b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args
index 0a96928277292af0dea7fc0d0e74d25358901704..c67e253746f73c551ab376634bfdc3083634aab6 100644 (file)
--- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args
+++ b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args
index f13573df8a2d0af90024649e9eecdbde8126af1c..51b72b3f331a279ad04a5dbd38b18fde8e475861 100644 (file)
--- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.xml b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.xml
index 265184e3a11933fbd7b8336904b698dfbf0ef23b..00e60ac70044a39426e96029d54091ebf76907be 100644 (file)
--- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.xml
+++ b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.xml
@@ -20,7 +20,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <memballoon model='virtio'/>
   </devices>

diff --git a/tests/qemuxml2argvdata/kvmclock.args b/tests/qemuxml2argvdata/kvmclock.args
index 029a2a0d5dda93fcdf8b7ed9006f42c1a73c6d9b..65bea1d0b0642d0cc81482226a2526a7889cfde3 100644 (file)
--- a/tests/qemuxml2argvdata/kvmclock.args
+++ b/tests/qemuxml2argvdata/kvmclock.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=kvm,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/kvmclock.xml b/tests/qemuxml2argvdata/kvmclock.xml
index 1b18ee70e55e0f61934d9ed3e6ae6c2c01e02a73..5d155e067f5053b38b51517904240d8bad824b40 100644 (file)
--- a/tests/qemuxml2argvdata/kvmclock.xml
+++ b/tests/qemuxml2argvdata/kvmclock.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>

diff --git a/tests/qemuxml2argvdata/lease.xml b/tests/qemuxml2argvdata/lease.xml
index 607484a410d94773d419c1e8acbbd315569df3de..d52b66b2f22a3cbf99accb20b05c95ad0468688f 100644 (file)
--- a/tests/qemuxml2argvdata/lease.xml
+++ b/tests/qemuxml2argvdata/lease.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/machine-core-off.args b/tests/qemuxml2argvdata/machine-core-off.args
index a9bd75becf26e979082ce44e394bbe1c268d4984..e38898e335ff059a6db24a8f108056f989643a8e 100644 (file)
--- a/tests/qemuxml2argvdata/machine-core-off.args
+++ b/tests/qemuxml2argvdata/machine-core-off.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/machine-core-off.xml b/tests/qemuxml2argvdata/machine-core-off.xml
index 18af6926f887cecad2bd8a023a022bb62bcc3692..36482550b6a96c53038cb8cd5eb72c22dfe8d4d2 100644 (file)
--- a/tests/qemuxml2argvdata/machine-core-off.xml
+++ b/tests/qemuxml2argvdata/machine-core-off.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/machine-core-on.args b/tests/qemuxml2argvdata/machine-core-on.args
index f7daff8d7410995704a32c039320baa83162355e..b3d271e1611cbf582c5df0fbdce82e64840f36fb 100644 (file)
--- a/tests/qemuxml2argvdata/machine-core-on.args
+++ b/tests/qemuxml2argvdata/machine-core-on.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=on \

diff --git a/tests/qemuxml2argvdata/machine-core-on.xml b/tests/qemuxml2argvdata/machine-core-on.xml
index d02b7e87c3a9bba270742a60057ddb4be5374e20..89396bb18658cba28272953f8409b64c822c9550 100644 (file)
--- a/tests/qemuxml2argvdata/machine-core-on.xml
+++ b/tests/qemuxml2argvdata/machine-core-on.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args b/tests/qemuxml2argvdata/machine-vmport-opt.args
index a67dd9f5b0ebbd7c1c698516c3fb5c2b307465f5..f3f5ddff1d0a6a578a6abcab08f01a3702f86887 100644 (file)
--- a/tests/qemuxml2argvdata/machine-vmport-opt.args
+++ b/tests/qemuxml2argvdata/machine-vmport-opt.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,vmport=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.xml b/tests/qemuxml2argvdata/machine-vmport-opt.xml
index 22fc040b285cb44e2f8c0ea29a4b93777907fdf5..656e1d395fc521f8b4837be1265c940c46b6fbcc 100644 (file)
--- a/tests/qemuxml2argvdata/machine-vmport-opt.xml
+++ b/tests/qemuxml2argvdata/machine-vmport-opt.xml
@@ -16,7 +16,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/master-key.args b/tests/qemuxml2argvdata/master-key.args
index 636e84d9864998554b3f4befb1748222464693f7..9e91135f3147275c4d3d581e9b55fb6908031b25 100644 (file)
--- a/tests/qemuxml2argvdata/master-key.args
+++ b/tests/qemuxml2argvdata/master-key.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/master-key.xml b/tests/qemuxml2argvdata/master-key.xml
index 848d0dd2eb7e74e4e81b2a33c0cd5c8cd9cca729..ecf8a2db853d77668257de2e58317bd389248b74 100644 (file)
--- a/tests/qemuxml2argvdata/master-key.xml
+++ b/tests/qemuxml2argvdata/master-key.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/memory-align-fail.xml b/tests/qemuxml2argvdata/memory-align-fail.xml
index d1306058bb1992e537c13e5376f3428ad8b96d4c..75c1a46068cf7f31dfc043a463139e9f476c335a 100644 (file)
--- a/tests/qemuxml2argvdata/memory-align-fail.xml
+++ b/tests/qemuxml2argvdata/memory-align-fail.xml
@@ -20,7 +20,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='ide' index='0'/>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
index 222aa4c0b4dfa01bd82eab6ff5658ba93dad9020..9ba3f8b7a082757351d01a3cad2407d6daf07d90 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.xml b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.xml
index 9503557cc90c98efa907da4943e8379caa07beec..c289fdd5ff4a88dc428645ac80ea2986f7eb9efc 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.xml
@@ -20,7 +20,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
index 068e4be98b28297b41a524d134e7b7e7264e5b42..0ac48db399495a3e208e98a2d61500649514d616 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.xml b/tests/qemuxml2argvdata/memory-hotplug-dimm.xml
index 9ef85ad40a60e928157824a749d020d3791006f6..c68336f871a416947ceeb277f139441a15332d3a 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.xml
@@ -24,7 +24,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/memory-hotplug-nonuma.xml b/tests/qemuxml2argvdata/memory-hotplug-nonuma.xml
index 51653170385d8d48985869e1f981214c3a1bb1c6..a441eb7b772ae5ff65f26b8e737b34c01532076c 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-nonuma.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-nonuma.xml
@@ -14,7 +14,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>

diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args
index ee860097e8550830a1c286076bbf221a50e2d766..beac9ab22a9c0afc81a367be452ef8e4746971a2 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml
index b41484ad2bae9df51aa81868802dd119ddc705f3..4e62dd0e18430c7537702f9ecae6c6468dd7e972 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml
@@ -24,7 +24,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args
index 9705dcd1374b29b8ba2a22d36aa8f47877d59714..3e599098f0426d17c60766fa61f7582f0ad514bd 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml
index a8c5198e9e36fd3bf142940ed3a437ee840c2dda..defa109e80881325c2947424c487d29ed97e1ede 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml
@@ -24,7 +24,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args
index b3f750456c2f19f6f3a3ddc44993cf9024a41b95..05a473dbcc413c1497d228e2a5f28e1552661cc8 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml
index e266147a2908625a1f11e8c3b053f1e9809c5f44..89d01d672f960d6c330273348bdf58af5d0d8dee 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml
@@ -24,7 +24,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
index 07ec6b68fa5b17daecf389c857fc0b7bdd24d371..c3554ac1015b67dc17b1106cf3ac7cb62a21ede5 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml
index 060d75c5415f1dab81c473014fa4275ca077bdd1..e6a4f7901aa01606476e9cb1e13b72d21ba6b66a 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml
@@ -24,7 +24,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
index 0b7a3799146b9d2f1f302392be287aa258e19f63..e1d3fc57a4719ea6db0eccd82f6e6692bc61364f 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml
index 170992c9fcfff4383eacb677a396d8c43d7b0481..dd48540712b095cb307d8aa7bef84732c89558b2 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml
@@ -24,7 +24,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args
index 2d7cdedcf40b5a2e75949378abb0e82a752d9950..dc6ddd3a0e033d97923f24ecbfd83d1e799ae3b5 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml
index 751ad2747487294fb6c47fab0eb4aacab5ab6469..9c76dda6c82b55d5999a149137ddc163252627fa 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml
@@ -24,7 +24,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/memory-hotplug.args b/tests/qemuxml2argvdata/memory-hotplug.args
index 8c50c11eddc20fba9288e77fb9126001c036a27d..c2c80ecf0043b2c852bd67cfb4d186f5c4b7d1f7 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug.args
+++ b/tests/qemuxml2argvdata/memory-hotplug.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/memory-hotplug.xml b/tests/qemuxml2argvdata/memory-hotplug.xml
index 3bda22bc89e6f6d6e4caffd5972548e3df6eb1ab..e1f086567bf82aa4cdd8fe9972caa9567cb738b0 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug.xml
@@ -20,7 +20,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/memorybacking-set.xml b/tests/qemuxml2argvdata/memorybacking-set.xml
index dd195cbb5085cdc71c1a8b7ac1ddb9e7fc2ba14f..9bd4e72485ac68dd5843dc6fa51d36789c15d502 100644 (file)
--- a/tests/qemuxml2argvdata/memorybacking-set.xml
+++ b/tests/qemuxml2argvdata/memorybacking-set.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <memballoon model='virtio'/>
   </devices>
 </domain>

diff --git a/tests/qemuxml2argvdata/memorybacking-unset.xml b/tests/qemuxml2argvdata/memorybacking-unset.xml
index 5a4ef96896e5e85d38f390bd108e6e4812ed3907..c64c7397d0d4bfa2752b5c7f7c94741799533280 100644 (file)
--- a/tests/qemuxml2argvdata/memorybacking-unset.xml
+++ b/tests/qemuxml2argvdata/memorybacking-unset.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <memballoon model='virtio'/>
   </devices>
 </domain>

diff --git a/tests/qemuxml2argvdata/memtune-unlimited.args b/tests/qemuxml2argvdata/memtune-unlimited.args
index 3a1f010e3ef9897b8cbb995853463b94888a353a..60253f43ec6e495558d004e3a22e50194b3fde10 100644 (file)
--- a/tests/qemuxml2argvdata/memtune-unlimited.args
+++ b/tests/qemuxml2argvdata/memtune-unlimited.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/memtune-unlimited.xml b/tests/qemuxml2argvdata/memtune-unlimited.xml
index 58c37dc1ad33abe0352b9139c71c4f55b9b8cadc..db67e409f0fea20901a2169e3e1c2bb0a08f091a 100644 (file)
--- a/tests/qemuxml2argvdata/memtune-unlimited.xml
+++ b/tests/qemuxml2argvdata/memtune-unlimited.xml
@@ -16,7 +16,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/memtune.args b/tests/qemuxml2argvdata/memtune.args
index 3a1f010e3ef9897b8cbb995853463b94888a353a..60253f43ec6e495558d004e3a22e50194b3fde10 100644 (file)
--- a/tests/qemuxml2argvdata/memtune.args
+++ b/tests/qemuxml2argvdata/memtune.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/memtune.xml b/tests/qemuxml2argvdata/memtune.xml
index 1fd607e5235bab47b44e5a85e1d12a8ef02f0848..94a86a807091e428bff9c2fba741591ea1252e6f 100644 (file)
--- a/tests/qemuxml2argvdata/memtune.xml
+++ b/tests/qemuxml2argvdata/memtune.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/metadata-duplicate.xml b/tests/qemuxml2argvdata/metadata-duplicate.xml
index 0c3cbaf6da66b0ddb3f7da4a19c7ada44eae43b5..fdf2110bc3cedecd5c32c4524d21b73238ad66f2 100644 (file)
--- a/tests/qemuxml2argvdata/metadata-duplicate.xml
+++ b/tests/qemuxml2argvdata/metadata-duplicate.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/metadata.xml b/tests/qemuxml2argvdata/metadata.xml
index 5fddf946228da304073dae80ee000da50fc253fc..18ab46899e658010868aa198be718319d74f6c78 100644 (file)
--- a/tests/qemuxml2argvdata/metadata.xml
+++ b/tests/qemuxml2argvdata/metadata.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/migrate.args b/tests/qemuxml2argvdata/migrate.args
index c8fa035acfc01d6c9b6431846d49b3ab1ec0d003..c977c62ab444bb2a53fa89784de4b4a942f3cfdd 100644 (file)
--- a/tests/qemuxml2argvdata/migrate.args
+++ b/tests/qemuxml2argvdata/migrate.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/migrate.xml b/tests/qemuxml2argvdata/migrate.xml
index be60ddcbe53e99c18cf6a0405b87994215dbdc62..7b4ea974ebc12a3a81b2e20777ac6f584a9b74f5 100644 (file)
--- a/tests/qemuxml2argvdata/migrate.xml
+++ b/tests/qemuxml2argvdata/migrate.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/minimal-msg-timestamp.args b/tests/qemuxml2argvdata/minimal-msg-timestamp.args
index a932e4aa786ead84c3698b18ab6381001b047a19..42ca3cbf3807c06ba3d41c1c55c74dc0175bf2ff 100644 (file)
--- a/tests/qemuxml2argvdata/minimal-msg-timestamp.args
+++ b/tests/qemuxml2argvdata/minimal-msg-timestamp.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/minimal-msg-timestamp.xml b/tests/qemuxml2argvdata/minimal-msg-timestamp.xml
index 97ad905826c49445afe872c7701bb0f2559bb4bf..6a2b2a18e7c7ab59b18ff69f84485bf6462aaad3 100644 (file)
--- a/tests/qemuxml2argvdata/minimal-msg-timestamp.xml
+++ b/tests/qemuxml2argvdata/minimal-msg-timestamp.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/minimal-no-memory.xml b/tests/qemuxml2argvdata/minimal-no-memory.xml
index d4a6a4fb503f3a05b765b31a10f0e37a6a960f8a..8c6b5a71be73c16d3bf011b826bff524e1e15e42 100644 (file)
--- a/tests/qemuxml2argvdata/minimal-no-memory.xml
+++ b/tests/qemuxml2argvdata/minimal-no-memory.xml
@@ -11,7 +11,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/minimal-sandbox.args b/tests/qemuxml2argvdata/minimal-sandbox.args
index 998b21b00d91da4b74b241c0cb615ce7fbf36d30..3f7078605c386d8d1daf16f1e11d71013c1f0f1b 100644 (file)
--- a/tests/qemuxml2argvdata/minimal-sandbox.args
+++ b/tests/qemuxml2argvdata/minimal-sandbox.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/minimal-sandbox.xml b/tests/qemuxml2argvdata/minimal-sandbox.xml
index 9ef92f8feb6270b022ffb848fd1fb2dfe746e906..870190635767b50c23f11fd3e592e5293f1ddb54 100644 (file)
--- a/tests/qemuxml2argvdata/minimal-sandbox.xml
+++ b/tests/qemuxml2argvdata/minimal-sandbox.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/minimal.args b/tests/qemuxml2argvdata/minimal.args
index 3a1f010e3ef9897b8cbb995853463b94888a353a..60253f43ec6e495558d004e3a22e50194b3fde10 100644 (file)
--- a/tests/qemuxml2argvdata/minimal.args
+++ b/tests/qemuxml2argvdata/minimal.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/minimal.xml b/tests/qemuxml2argvdata/minimal.xml
index 9ef92f8feb6270b022ffb848fd1fb2dfe746e906..870190635767b50c23f11fd3e592e5293f1ddb54 100644 (file)
--- a/tests/qemuxml2argvdata/minimal.xml
+++ b/tests/qemuxml2argvdata/minimal.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/misc-acpi.args b/tests/qemuxml2argvdata/misc-acpi.args
index c73239bbb393860039e277b8654afde9e87c85c2..5ddfded1512dc85605450a8aa65b1bf3e777cb1b 100644 (file)
--- a/tests/qemuxml2argvdata/misc-acpi.args
+++ b/tests/qemuxml2argvdata/misc-acpi.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/misc-acpi.xml b/tests/qemuxml2argvdata/misc-acpi.xml
index cc51799deebaa57c2d190c6914b387bab360c557..718847daee08c1dfdf216cd2f064c87ba4c500ef 100644 (file)
--- a/tests/qemuxml2argvdata/misc-acpi.xml
+++ b/tests/qemuxml2argvdata/misc-acpi.xml
@@ -16,7 +16,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/misc-disable-s3.args b/tests/qemuxml2argvdata/misc-disable-s3.args
index 12c0e37fb47352a409d5887f83ff5f85088a4ffb..a327c45a8f4ab5da8728ed90dac7748201ed3bbe 100644 (file)
--- a/tests/qemuxml2argvdata/misc-disable-s3.args
+++ b/tests/qemuxml2argvdata/misc-disable-s3.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/misc-disable-s3.xml b/tests/qemuxml2argvdata/misc-disable-s3.xml
index 5860c0c0684fc122e5ad37c0808c8dc92c2fbfe8..d65b72dbd4f98d6e7191dda2e8769340babc2113 100644 (file)
--- a/tests/qemuxml2argvdata/misc-disable-s3.xml
+++ b/tests/qemuxml2argvdata/misc-disable-s3.xml
@@ -16,7 +16,7 @@
     <suspend-to-mem enabled='no'/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.args b/tests/qemuxml2argvdata/misc-disable-suspends.args
index 7be83760d4d1fb893c05e00fc87a4efafa20e152..b36dfe8512649bc7885c63e6ae8aa4c8968f7f33 100644 (file)
--- a/tests/qemuxml2argvdata/misc-disable-suspends.args
+++ b/tests/qemuxml2argvdata/misc-disable-suspends.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.xml b/tests/qemuxml2argvdata/misc-disable-suspends.xml
index 5b0ffb132dac786924638cf853e4b6b4988362b8..3c51e3fb6e0a4a9078e2358f51724aa6d45a6d8f 100644 (file)
--- a/tests/qemuxml2argvdata/misc-disable-suspends.xml
+++ b/tests/qemuxml2argvdata/misc-disable-suspends.xml
@@ -17,7 +17,7 @@
     <suspend-to-disk enabled='no'/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/misc-enable-s4.args b/tests/qemuxml2argvdata/misc-enable-s4.args
index b4e411d43046db5a782148ed26dc86f1af1fe132..4b99bdd51c3dc9918748ec74cf94171a4f5125ad 100644 (file)
--- a/tests/qemuxml2argvdata/misc-enable-s4.args
+++ b/tests/qemuxml2argvdata/misc-enable-s4.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/misc-enable-s4.xml b/tests/qemuxml2argvdata/misc-enable-s4.xml
index d8eed5eaabca6aa644ab240aed5a149b3877d7fd..62f32c2b02758e5a7909cabbcc65ae553937120e 100644 (file)
--- a/tests/qemuxml2argvdata/misc-enable-s4.xml
+++ b/tests/qemuxml2argvdata/misc-enable-s4.xml
@@ -16,7 +16,7 @@
     <suspend-to-disk enabled='yes'/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/misc-no-reboot.args b/tests/qemuxml2argvdata/misc-no-reboot.args
index daa6762ff100c7a3dd0b35aae2d3a9d6350f3ce4..057568bbe0f49fe64f71ae9984f515104e8d7904 100644 (file)
--- a/tests/qemuxml2argvdata/misc-no-reboot.args
+++ b/tests/qemuxml2argvdata/misc-no-reboot.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/misc-no-reboot.xml b/tests/qemuxml2argvdata/misc-no-reboot.xml
index 9bf051f0e6938e2af433ea197ce0b887b958aaaa..80abc68388037d4629736ed248e0e1c3287d87cc 100644 (file)
--- a/tests/qemuxml2argvdata/misc-no-reboot.xml
+++ b/tests/qemuxml2argvdata/misc-no-reboot.xml
@@ -13,7 +13,7 @@
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/misc-uuid.args b/tests/qemuxml2argvdata/misc-uuid.args
index c73239bbb393860039e277b8654afde9e87c85c2..5ddfded1512dc85605450a8aa65b1bf3e777cb1b 100644 (file)
--- a/tests/qemuxml2argvdata/misc-uuid.args
+++ b/tests/qemuxml2argvdata/misc-uuid.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/misc-uuid.xml b/tests/qemuxml2argvdata/misc-uuid.xml
index cc51799deebaa57c2d190c6914b387bab360c557..718847daee08c1dfdf216cd2f064c87ba4c500ef 100644 (file)
--- a/tests/qemuxml2argvdata/misc-uuid.xml
+++ b/tests/qemuxml2argvdata/misc-uuid.xml
@@ -16,7 +16,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/missing-machine.xml b/tests/qemuxml2argvdata/missing-machine.xml
index 2900baec908ddcdd555f379a7535eb38002c37e8..30735b503a06d28b1210fe24c601d13701a6259d 100644 (file)
--- a/tests/qemuxml2argvdata/missing-machine.xml
+++ b/tests/qemuxml2argvdata/missing-machine.xml
@@ -14,7 +14,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args b/tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args
index cea23c4d8a748ab7f993effc4b29cc86544bd035..8f3725ebd560a4176de6b0c44a2377c4c953428c 100644 (file)
--- a/tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args
+++ b/tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args b/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args
index 84bf8b96a7205bb80ea688c69ef11f710f14a021..daf40197aba5fc26f35a32f85ac310df8242db86 100644 (file)
--- a/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/mlock-off.xml b/tests/qemuxml2argvdata/mlock-off.xml
index 16400bae67b094a9becd0dad1d3c97e7a39ed189..433011caa0338d0d5ffd4e5937a6f4fba5629785 100644 (file)
--- a/tests/qemuxml2argvdata/mlock-off.xml
+++ b/tests/qemuxml2argvdata/mlock-off.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args b/tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args
index 2ea145d7988389f4ac69a2233d5454fdacbbaf2d..46e63a287f4631a163afa1ce1c156a2a97b3ae77 100644 (file)
--- a/tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args
+++ b/tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args b/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args
index ec1376561eec0d4d0dec4c2855a55f4ab143fb4f..04d43af8597b93cceace3c15e797c737ed19161d 100644 (file)
--- a/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/mlock-on.xml b/tests/qemuxml2argvdata/mlock-on.xml
index a2bf9e1d939d3fcf5aab90f4e0f476eaba4c8cd0..5ec181d8213c37f0f3b560834b2626b5ffc9aa89 100644 (file)
--- a/tests/qemuxml2argvdata/mlock-on.xml
+++ b/tests/qemuxml2argvdata/mlock-on.xml
@@ -12,7 +12,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxml2argvdata/monitor-json.args b/tests/qemuxml2argvdata/monitor-json.args
index fcd0f3649881ebd97937184c761836a7ef136ec5..50bbb36f27de4277446dd531baf3f200910c72ce 100644 (file)
--- a/tests/qemuxml2argvdata/monitor-json.args
+++ b/tests/qemuxml2argvdata/monitor-json.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-encryptdisk/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-encryptdisk/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-encryptdisk/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name encryptdisk \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/monitor-json.xml b/tests/qemuxml2argvdata/monitor-json.xml
index 1bd0dae61fe09ea925ad16bc852fbf8f38c7f0cc..d3a630ab3ed5343505e3718b6d2b8153382c200e 100644 (file)
--- a/tests/qemuxml2argvdata/monitor-json.xml
+++ b/tests/qemuxml2argvdata/monitor-json.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source file='/dev/hda1'/>

diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.args b/tests/qemuxml2argvdata/multifunction-pci-device.args
index cb810e758a005eb11d9c8689b8c661beb2820c2c..abf230fbac804f56bc257c4cd6b10c07774a79a4 100644 (file)
--- a/tests/qemuxml2argvdata/multifunction-pci-device.args
+++ b/tests/qemuxml2argvdata/multifunction-pci-device.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.xml b/tests/qemuxml2argvdata/multifunction-pci-device.xml
index 5c295b66ad33c441934cdbfb4a1e321b98a00088..806cfa44ae492243623cb233bbcd2640d9f54716 100644 (file)
--- a/tests/qemuxml2argvdata/multifunction-pci-device.xml
+++ b/tests/qemuxml2argvdata/multifunction-pci-device.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <source file='/tmp/scsidisk.img'/>
       <target dev='sda' bus='scsi'/>

diff --git a/tests/qemuxml2argvdata/name-escape.args b/tests/qemuxml2argvdata/name-escape.args
index d6356561dd1960ec48c8bad755d0f985d34c6198..1ba2dfbf836e067fb24845db5e19f1a16efb6718 100644 (file)
--- a/tests/qemuxml2argvdata/name-escape.args
+++ b/tests/qemuxml2argvdata/name-escape.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-foo=1,bar=2/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-foo=1,bar=2/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-foo=1,bar=2/.config \
 QEMU_AUDIO_DRV=spice \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=foo=1,,bar=2,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-foo=1,,\

diff --git a/tests/qemuxml2argvdata/name-escape.xml b/tests/qemuxml2argvdata/name-escape.xml
index fab2a77547b117fec337e0ebdd312893d613a6ef..6aefac19b2abfeddf4728a7f660b154649deefc9 100644 (file)
--- a/tests/qemuxml2argvdata/name-escape.xml
+++ b/tests/qemuxml2argvdata/name-escape.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='qcow2' cache='none'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/net-client.args b/tests/qemuxml2argvdata/net-client.args
index 42d182c6eceabd78b219227c8c824c1670fbab7f..0aa6645c4dd9ec72f0381076f1e56bd73222ee10 100644 (file)
--- a/tests/qemuxml2argvdata/net-client.args
+++ b/tests/qemuxml2argvdata/net-client.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/net-client.xml b/tests/qemuxml2argvdata/net-client.xml
index e9dece8d56db1345bc2f83e943973f8964eef394..d6a634338c2f9ad50c3d4fad8fbe223fb0f70745 100644 (file)
--- a/tests/qemuxml2argvdata/net-client.xml
+++ b/tests/qemuxml2argvdata/net-client.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/net-eth-hostip.args b/tests/qemuxml2argvdata/net-eth-hostip.args
index 91d7fdbbc5d5719c04055e53c4946d5c2752ea24..ff136626a73fdd8c07bae27bef7817144f83eea8 100644 (file)
--- a/tests/qemuxml2argvdata/net-eth-hostip.args
+++ b/tests/qemuxml2argvdata/net-eth-hostip.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/net-eth-hostip.xml b/tests/qemuxml2argvdata/net-eth-hostip.xml
index 9dc9a8c0fc924b3ddc76fe331f2fae7079fb3bb1..2430941df8a786703bdc25e144dd2c88e8a6033e 100644 (file)
--- a/tests/qemuxml2argvdata/net-eth-hostip.xml
+++ b/tests/qemuxml2argvdata/net-eth-hostip.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/net-eth-ifname.args b/tests/qemuxml2argvdata/net-eth-ifname.args
index 91d7fdbbc5d5719c04055e53c4946d5c2752ea24..ff136626a73fdd8c07bae27bef7817144f83eea8 100644 (file)
--- a/tests/qemuxml2argvdata/net-eth-ifname.args
+++ b/tests/qemuxml2argvdata/net-eth-ifname.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/net-eth-ifname.xml b/tests/qemuxml2argvdata/net-eth-ifname.xml
index dd0d7520718a5744b9444e08c37dd4cf54eab706..86a41c17d9839ac251c6d1ec0585cd0d6ff84811 100644 (file)
--- a/tests/qemuxml2argvdata/net-eth-ifname.xml
+++ b/tests/qemuxml2argvdata/net-eth-ifname.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/net-eth-names.args b/tests/qemuxml2argvdata/net-eth-names.args
index bf3083697d819ee9f444454989823583b8466ec8..a79edee5241044d59bee8c6b29f964626723fe0f 100644 (file)
--- a/tests/qemuxml2argvdata/net-eth-names.args
+++ b/tests/qemuxml2argvdata/net-eth-names.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/net-eth-names.xml b/tests/qemuxml2argvdata/net-eth-names.xml
index 37639b30cbd055a77e63459b2120987ecc73d3b9..344cf9252d8a55987f687724146d91b9bff3bdb4 100644 (file)
--- a/tests/qemuxml2argvdata/net-eth-names.xml
+++ b/tests/qemuxml2argvdata/net-eth-names.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
index 2bb99e96da66828e37e3e485e18e9bd4d3c5bf67..435843bc278af7875ee4038ae5f02c3a1a8bb64f 100644 (file)
--- a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
+++ b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.xml b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.xml
index 7f5a0c217b079cba61aba73a7b6eafc6c4d136a5..217b57ea0b43c338308a2c5cff8e194ef18a54cc 100644 (file)
--- a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.xml
+++ b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/net-eth.args b/tests/qemuxml2argvdata/net-eth.args
index 91d7fdbbc5d5719c04055e53c4946d5c2752ea24..ff136626a73fdd8c07bae27bef7817144f83eea8 100644 (file)
--- a/tests/qemuxml2argvdata/net-eth.args
+++ b/tests/qemuxml2argvdata/net-eth.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/net-eth.xml b/tests/qemuxml2argvdata/net-eth.xml
index 48acadf013cd8b03797208593dca906cb1ee046c..5fa415bb63dcf98c9e8645ee6d3cd09593c5e419 100644 (file)
--- a/tests/qemuxml2argvdata/net-eth.xml
+++ b/tests/qemuxml2argvdata/net-eth.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/net-hostdev-bootorder.args b/tests/qemuxml2argvdata/net-hostdev-bootorder.args
index 515b0c58d3155f6a884c5221f45892ef4dcee6a4..7c7e5bc3a22b53d3be230b50d14806453eba6251 100644 (file)
--- a/tests/qemuxml2argvdata/net-hostdev-bootorder.args
+++ b/tests/qemuxml2argvdata/net-hostdev-bootorder.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/net-hostdev-bootorder.xml b/tests/qemuxml2argvdata/net-hostdev-bootorder.xml
index cd9f32b2f3f502464526e37c955f6c8f38c9f100..acf05ba16423985b1f9ee3540e761050fdb1bca7 100644 (file)
--- a/tests/qemuxml2argvdata/net-hostdev-bootorder.xml
+++ b/tests/qemuxml2argvdata/net-hostdev-bootorder.xml
@@ -12,7 +12,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/net-hostdev-fail.xml b/tests/qemuxml2argvdata/net-hostdev-fail.xml
index 50b102c658cf76fa9eb605c8bfe9723334dcd4c9..a2c9ee21e0115ab2986b16082fc097cc9829f2fa 100644 (file)
--- a/tests/qemuxml2argvdata/net-hostdev-fail.xml
+++ b/tests/qemuxml2argvdata/net-hostdev-fail.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/net-hostdev-multidomain.args b/tests/qemuxml2argvdata/net-hostdev-multidomain.args
index 18c5e981880ff776b01d812e093bfc5770ff1741..46f28022fdb68c153de467599eafc29f7cfb0f9c 100644 (file)
--- a/tests/qemuxml2argvdata/net-hostdev-multidomain.args
+++ b/tests/qemuxml2argvdata/net-hostdev-multidomain.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/net-hostdev-multidomain.xml b/tests/qemuxml2argvdata/net-hostdev-multidomain.xml
index 27e5f0f7246b5195759f7f63f368989a2bc8ac79..8bb3022ce02345abac73cb298b1c28cfa302387d 100644 (file)
--- a/tests/qemuxml2argvdata/net-hostdev-multidomain.xml
+++ b/tests/qemuxml2argvdata/net-hostdev-multidomain.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
index 7e4ee5d62d8cf4799e05dbed611d8a7a7b143c5a..ed8332ddfee6ec192245b6a78d54f46a3e71e95f 100644 (file)
--- a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.xml b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.xml
index c73edf8e444d39f623968cbf3786f53398026d00..c247a15444d708de838d20597daa9f2ddd4d1121 100644 (file)
--- a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.xml
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio.args b/tests/qemuxml2argvdata/net-hostdev-vfio.args
index b0178a81bbf9fdab2e3de42789dbbc2c2447bfd9..cd875f60c97c4515518e50207690066e5478d008 100644 (file)
--- a/tests/qemuxml2argvdata/net-hostdev-vfio.args
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio.xml b/tests/qemuxml2argvdata/net-hostdev-vfio.xml
index aff681c0fbd7f06c4d037ac61272a1488fc17134..6f64229191368f3f4ce9e3081070bc18ec6b3560 100644 (file)
--- a/tests/qemuxml2argvdata/net-hostdev-vfio.xml
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/net-hostdev.args b/tests/qemuxml2argvdata/net-hostdev.args
index aa9e91db825e694a7cdd40b0f8dccc880407441d..bd49544de691909e53682d019dfdb643f41b2f40 100644 (file)
--- a/tests/qemuxml2argvdata/net-hostdev.args
+++ b/tests/qemuxml2argvdata/net-hostdev.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/net-hostdev.xml b/tests/qemuxml2argvdata/net-hostdev.xml
index 829d8b850b88406a5eb30a29e0ea750322c244fe..e60e615a82503ce2e562bd2becbc5b0a406f154f 100644 (file)
--- a/tests/qemuxml2argvdata/net-hostdev.xml
+++ b/tests/qemuxml2argvdata/net-hostdev.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/net-many-models.args b/tests/qemuxml2argvdata/net-many-models.args
index 1bde5652b5d18b98a220373946c3ffdd61ffad2b..36b057131ffa5aa373f3d944500fbc7e65b1188e 100644 (file)
--- a/tests/qemuxml2argvdata/net-many-models.args
+++ b/tests/qemuxml2argvdata/net-many-models.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/net-mcast.args b/tests/qemuxml2argvdata/net-mcast.args
index f888f2f71af6feb1398289efab94f0797c543956..e8b71a3dedabb31fd9e771b3aee84d15c42a540e 100644 (file)
--- a/tests/qemuxml2argvdata/net-mcast.args
+++ b/tests/qemuxml2argvdata/net-mcast.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/net-mcast.xml b/tests/qemuxml2argvdata/net-mcast.xml
index 05117af289612bb9b2e15fa8967af41342c7826f..a1991620233a4c1235070aed7a61417779a866e9 100644 (file)
--- a/tests/qemuxml2argvdata/net-mcast.xml
+++ b/tests/qemuxml2argvdata/net-mcast.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/net-midonet.xml b/tests/qemuxml2argvdata/net-midonet.xml
index 90e35d9bc9c53e015098c4d6a7f92bf9fa1cb93d..2688b5023677ca5410ef19f3b00f8ba4a0b713fe 100644 (file)
--- a/tests/qemuxml2argvdata/net-midonet.xml
+++ b/tests/qemuxml2argvdata/net-midonet.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/net-openvswitch.xml b/tests/qemuxml2argvdata/net-openvswitch.xml
index d8e12372cbeb9c8fb26bf55d6cb7c69de4e5d1f1..7d928b5f8863bb4d110d99442a448cb2023e8ab6 100644 (file)
--- a/tests/qemuxml2argvdata/net-openvswitch.xml
+++ b/tests/qemuxml2argvdata/net-openvswitch.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/net-server.args b/tests/qemuxml2argvdata/net-server.args
index 86ca61c25bc3e11ca5a80a1d9275b21e0adb17b2..b92e5208202dfa2748e1aee4b9b1c84b2b64bc1e 100644 (file)
--- a/tests/qemuxml2argvdata/net-server.args
+++ b/tests/qemuxml2argvdata/net-server.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/net-server.xml b/tests/qemuxml2argvdata/net-server.xml
index f3703a9fc3be82190631cfacd20d4265bc15d4ed..b2fa27ca93543f26672a1f187083f34bcba9f8bf 100644 (file)
--- a/tests/qemuxml2argvdata/net-server.xml
+++ b/tests/qemuxml2argvdata/net-server.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/net-udp.args b/tests/qemuxml2argvdata/net-udp.args
index ee8077ece052c49e5037b40a8a46bc82b941bd4c..1390298e2e23b679137dc70a1088256709eec1c2 100644 (file)
--- a/tests/qemuxml2argvdata/net-udp.args
+++ b/tests/qemuxml2argvdata/net-udp.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/net-udp.xml b/tests/qemuxml2argvdata/net-udp.xml
index 30d5fdbea142611713e5d7dac8cbc8ff81c74260..b00805d35b3157f6f45b7dcc001849224e792599 100644 (file)
--- a/tests/qemuxml2argvdata/net-udp.xml
+++ b/tests/qemuxml2argvdata/net-udp.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/net-user-addr.args b/tests/qemuxml2argvdata/net-user-addr.args
index 5a828dd09151e6c268baacf916b03225ec7d133a..6cc82d9e62c8a9b3c23a439c8a7eb4f3a5b2942e 100644 (file)
--- a/tests/qemuxml2argvdata/net-user-addr.args
+++ b/tests/qemuxml2argvdata/net-user-addr.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/net-user-addr.xml b/tests/qemuxml2argvdata/net-user-addr.xml
index 0b5f15198972c2574c408c63543637ada968bc3b..f20f820eaa3bd8722a6fb00cc930835eae07b43d 100644 (file)
--- a/tests/qemuxml2argvdata/net-user-addr.xml
+++ b/tests/qemuxml2argvdata/net-user-addr.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/net-user.args b/tests/qemuxml2argvdata/net-user.args
index 888c16cb291f9cd558d1da51d9569f7b14ac8ec8..a8d43b068420f5cba40d5f39249653be8db33fa1 100644 (file)
--- a/tests/qemuxml2argvdata/net-user.args
+++ b/tests/qemuxml2argvdata/net-user.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args b/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args
index 3fb745c2127658ef3cef7331918f695832b3a361..190b068191d64c105f00f63d4f05a34edd6e354e 100644 (file)
--- a/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args
+++ b/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/net-user.xml b/tests/qemuxml2argvdata/net-user.xml
index 4cea9803883c1da10522945b5449f568305387e2..b8f3c67338bbd59de712c79250b469785e897a29 100644 (file)
--- a/tests/qemuxml2argvdata/net-user.xml
+++ b/tests/qemuxml2argvdata/net-user.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/net-vhostuser-fail.xml b/tests/qemuxml2argvdata/net-vhostuser-fail.xml
index 63dbfc77a5285bacaf33c47c6bb21493b4cfe853..4050191a265f21560852ed06f959e9cbb300749c 100644 (file)
--- a/tests/qemuxml2argvdata/net-vhostuser-fail.xml
+++ b/tests/qemuxml2argvdata/net-vhostuser-fail.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/net-vhostuser-multiq.args b/tests/qemuxml2argvdata/net-vhostuser-multiq.args
index 689a7452fee99e4708c9a617763710915bb93e12..691ef39edd3353accc4ac9fe0905350f3c3350dd 100644 (file)
--- a/tests/qemuxml2argvdata/net-vhostuser-multiq.args
+++ b/tests/qemuxml2argvdata/net-vhostuser-multiq.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/net-vhostuser-multiq.xml b/tests/qemuxml2argvdata/net-vhostuser-multiq.xml
index a30cce6b3109729d96e60e1a1c79de562abbcc1a..342d151d97068525c6dd934d676f88c67bd26278 100644 (file)
--- a/tests/qemuxml2argvdata/net-vhostuser-multiq.xml
+++ b/tests/qemuxml2argvdata/net-vhostuser-multiq.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/net-vhostuser.args b/tests/qemuxml2argvdata/net-vhostuser.args
index 25641eb512eef46b5789e8a12a1f779cc93849b3..1acc910ad1038f6e1b112e823c0b294796745f45 100644 (file)
--- a/tests/qemuxml2argvdata/net-vhostuser.args
+++ b/tests/qemuxml2argvdata/net-vhostuser.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args b/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args
index 17a97e3315f2ec18e673bbd472b5b0380dbc0edf..58dcbb510b3d66221d4ba6208634414fca84b820 100644 (file)
--- a/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args
+++ b/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc-i440fx-2.5,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args b/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args
index 042d569385d80cba057de091799ceecbb978b7f3..c2b498c616063aaf36f232cc69a8139542903677 100644 (file)
--- a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/net-vhostuser.xml b/tests/qemuxml2argvdata/net-vhostuser.xml
index 1c491549b695cfe5b66ee7559096e96ac4cc15e3..f392c89ee45ffa7d44ff004a58f7266e64d63388 100644 (file)
--- a/tests/qemuxml2argvdata/net-vhostuser.xml
+++ b/tests/qemuxml2argvdata/net-vhostuser.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>

diff --git a/tests/qemuxml2argvdata/net-virtio-device.args b/tests/qemuxml2argvdata/net-virtio-device.args
index 9fd0bafd23aa012eb6486d8e05ea97da3e8d1abf..67b0592fab93540187865a726e9e0f4fe2ff8c11 100644 (file)
--- a/tests/qemuxml2argvdata/net-virtio-device.args
+++ b/tests/qemuxml2argvdata/net-virtio-device.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/net-virtio-device.xml b/tests/qemuxml2argvdata/net-virtio-device.xml
index 9ddb9f5b9af0eb5c50ce8413fb097169f148ef47..c8bd8525eb7a1fd8d373a3ff83e17bfe84367084 100644 (file)
--- a/tests/qemuxml2argvdata/net-virtio-device.xml
+++ b/tests/qemuxml2argvdata/net-virtio-device.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
index 90b8c4eeef428cb4d9642791d9a99b129191ccfc..a9ac9687db18e18a8ea008d9171601b7fe6f9b57 100644 (file)
--- a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
+++ b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/net-virtio-disable-offloads.xml b/tests/qemuxml2argvdata/net-virtio-disable-offloads.xml
index 3e7b34abfd82e5134b9369f8f551f295e5a6e45b..c8debd6ae41d108c6351632e1773651674b0ab00 100644 (file)
--- a/tests/qemuxml2argvdata/net-virtio-disable-offloads.xml
+++ b/tests/qemuxml2argvdata/net-virtio-disable-offloads.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest7'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/net-virtio-netdev.args b/tests/qemuxml2argvdata/net-virtio-netdev.args
index 86d832cb53687dbf438a8b10233d872d41a57d8e..32d3b6b54157858fc2f6f9c7e7af9c308448eaa8 100644 (file)
--- a/tests/qemuxml2argvdata/net-virtio-netdev.args
+++ b/tests/qemuxml2argvdata/net-virtio-netdev.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/net-virtio-netdev.xml b/tests/qemuxml2argvdata/net-virtio-netdev.xml
index e7534c29ee86dcb7178e5d0f2975e9474572172a..f78ea5d64ea506e7d77b0dfc9dbf89bb090eca4e 100644 (file)
--- a/tests/qemuxml2argvdata/net-virtio-netdev.xml
+++ b/tests/qemuxml2argvdata/net-virtio-netdev.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/net-virtio-network-portgroup.xml b/tests/qemuxml2argvdata/net-virtio-network-portgroup.xml
index 3d6cd02a73285711f79980465fe3031f14eb6ab2..47d35e8661dd850364a501956bf82beef5d346f0 100644 (file)
--- a/tests/qemuxml2argvdata/net-virtio-network-portgroup.xml
+++ b/tests/qemuxml2argvdata/net-virtio-network-portgroup.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/net-virtio-rxqueuesize-invalid-size.xml b/tests/qemuxml2argvdata/net-virtio-rxqueuesize-invalid-size.xml
index 52bdcf533bfa525c9fed9cf797a029302770c359..2214884a05880576bf42dac59a62cce2c0c41159 100644 (file)
--- a/tests/qemuxml2argvdata/net-virtio-rxqueuesize-invalid-size.xml
+++ b/tests/qemuxml2argvdata/net-virtio-rxqueuesize-invalid-size.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
index 466eb61ce38bfdcb180456879eaef10da2aee5a2..758da237dd7742721029ec74803d867cf27b2f08 100644 (file)
--- a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
+++ b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.xml b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.xml
index b51931d525f0ffd33e19b9d66fc31eb1c3b33a0a..000af9830e299b5dc060942f52e06a5edd834c5f 100644 (file)
--- a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.xml
+++ b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/net-virtio.args b/tests/qemuxml2argvdata/net-virtio.args
index da5073020a87221de3402aafbb6c9ba303ac9397..4beb5ca75ff5e97d06b338a2b03a27d5bf30bdcc 100644 (file)
--- a/tests/qemuxml2argvdata/net-virtio.args
+++ b/tests/qemuxml2argvdata/net-virtio.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/net-virtio.xml b/tests/qemuxml2argvdata/net-virtio.xml
index 93bd5d1bce2ff44f30ebbb162145ff569cb4cfa6..372c79d8de6aac6f5a35ae21c8d0ea1fb0de2120 100644 (file)
--- a/tests/qemuxml2argvdata/net-virtio.xml
+++ b/tests/qemuxml2argvdata/net-virtio.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/nosharepages.args b/tests/qemuxml2argvdata/nosharepages.args
index 45b22616039ec7c1c2d47dcd9da8cc821c825e84..3993edfc4b71d3062e1ba3e23bdd488ea8dbd3a0 100644 (file)
--- a/tests/qemuxml2argvdata/nosharepages.args
+++ b/tests/qemuxml2argvdata/nosharepages.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off,mem-merge=off \

diff --git a/tests/qemuxml2argvdata/nosharepages.xml b/tests/qemuxml2argvdata/nosharepages.xml
index 53fa96bcdf924dde3ca772f2033a706a81f12f78..d2ab0287152c5f85ff616476e1dae86406e7bd6f 100644 (file)
--- a/tests/qemuxml2argvdata/nosharepages.xml
+++ b/tests/qemuxml2argvdata/nosharepages.xml
@@ -16,7 +16,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
index 3d71d03b9c2bdc2b8c05722c6c72a68a612bc946..7270aafeb73dfc99cbaf24a40b0061cec4c53574 100644 (file)
--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
+++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.xml b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.xml
index 5ab3a8546d3a870d731284bbf453480883bfe6ff..50dbc3c466f5e5e33dffb139f6cdde26f3139a9e 100644 (file)
--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.xml
+++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
index 3d71d03b9c2bdc2b8c05722c6c72a68a612bc946..7270aafeb73dfc99cbaf24a40b0061cec4c53574 100644 (file)
--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
+++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
index 4ea112a6b46235f76977bbbaccc71850e28bba43..d9cd6b83f18d8a35f989e1ec4881ef031da5fad4 100644 (file)
--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
+++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.xml b/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.xml
index d3c4e4be1f8316be2c2897ceaaec9ddd2fb6298a..f21ba0a7865c8adce500c974d4c21abafc88163f 100644 (file)
--- a/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.xml
+++ b/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.xml
@@ -16,7 +16,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.xml b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.xml
index dcb16bfd74b1514c4c8dc66c6ecbdc4f5aa4555f..378d17facef488a5eb150937c47b0bda6bc6c14e 100644 (file)
--- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.xml
+++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
index 3d71d03b9c2bdc2b8c05722c6c72a68a612bc946..7270aafeb73dfc99cbaf24a40b0061cec4c53574 100644 (file)
--- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
+++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.xml b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.xml
index b4cda72bcf8a7bf607186e4bf3e892b25087de51..e20bd8db0b8c6ab51ad9a40adce24f1729ee6d4d 100644 (file)
--- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.xml
+++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
index 3d71d03b9c2bdc2b8c05722c6c72a68a612bc946..7270aafeb73dfc99cbaf24a40b0061cec4c53574 100644 (file)
--- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
+++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.xml b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.xml
index 5ab3a8546d3a870d731284bbf453480883bfe6ff..50dbc3c466f5e5e33dffb139f6cdde26f3139a9e 100644 (file)
--- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.xml
+++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.xml b/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.xml
index e06b149baadd5d098b2f4daf86c99e263b124892..7ccaa5aff4e3ab005a1e87a91b222e6e8237eb11 100644 (file)
--- a/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.xml
+++ b/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.xml
@@ -16,7 +16,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/numad.args b/tests/qemuxml2argvdata/numad.args
index 3d71d03b9c2bdc2b8c05722c6c72a68a612bc946..7270aafeb73dfc99cbaf24a40b0061cec4c53574 100644 (file)
--- a/tests/qemuxml2argvdata/numad.args
+++ b/tests/qemuxml2argvdata/numad.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/numad.xml b/tests/qemuxml2argvdata/numad.xml
index 76e97ce092c92757cb8f9acf8a67c2e6d69d528d..081a59a0139cfb9fb01e9408b939083548098b7e 100644 (file)
--- a/tests/qemuxml2argvdata/numad.xml
+++ b/tests/qemuxml2argvdata/numad.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
index 3d71d03b9c2bdc2b8c05722c6c72a68a612bc946..7270aafeb73dfc99cbaf24a40b0061cec4c53574 100644 (file)
--- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
+++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.xml b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.xml
index a7c4c77a2ade5941d47bd6ca67d4358926e50649..44ec55a81042990548c047735b271c60248f53f2 100644 (file)
--- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.xml
+++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.xml b/tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.xml
index 5bf2a7b630a700df0717f0231211b04f899af68a..441f2b89891aa2467c6a2bc69fc294e153b9c1bd 100644 (file)
--- a/tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.xml
+++ b/tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/numatune-memory.args b/tests/qemuxml2argvdata/numatune-memory.args
index 3d71d03b9c2bdc2b8c05722c6c72a68a612bc946..7270aafeb73dfc99cbaf24a40b0061cec4c53574 100644 (file)
--- a/tests/qemuxml2argvdata/numatune-memory.args
+++ b/tests/qemuxml2argvdata/numatune-memory.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/numatune-memory.xml b/tests/qemuxml2argvdata/numatune-memory.xml
index dce4e49bb498455d970325fb829a0a2e6dc8720d..c9887dbebc2ced8d508c3926c6c4d058c2511d16 100644 (file)
--- a/tests/qemuxml2argvdata/numatune-memory.xml
+++ b/tests/qemuxml2argvdata/numatune-memory.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.xml b/tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.xml
index 3e0741475fc6ea565e5b5fd11d12faa7b0e628f0..631d3bad3862eab7ecace2bc7d1e68edcaa9661e 100644 (file)
--- a/tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.xml
+++ b/tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.xml
@@ -23,7 +23,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/pages-discard-hugepages.args b/tests/qemuxml2argvdata/pages-discard-hugepages.args
index 6e8146c895d27c15c62ae86eed0ed7ccad10dad1..bbf3c9f67a906d1424662a36f8c615985d52671e 100644 (file)
--- a/tests/qemuxml2argvdata/pages-discard-hugepages.args
+++ b/tests/qemuxml2argvdata/pages-discard-hugepages.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name SomeDummyHugepagesGuest \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/pages-discard-hugepages.xml b/tests/qemuxml2argvdata/pages-discard-hugepages.xml
index d1620d1946be70efa9a5c49075b3ebb2b1984486..ae294c8f415d9764f0e462c8f8d73c9c7d0ce563 100644 (file)
--- a/tests/qemuxml2argvdata/pages-discard-hugepages.xml
+++ b/tests/qemuxml2argvdata/pages-discard-hugepages.xml
@@ -22,7 +22,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2argvdata/pages-discard.args b/tests/qemuxml2argvdata/pages-discard.args
index 42c5582720cedeb9077e5c3714222997d7253b0b..b2aed77ff94c8160dd48312374eafefc7f755f27 100644 (file)
--- a/tests/qemuxml2argvdata/pages-discard.args
+++ b/tests/qemuxml2argvdata/pages-discard.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/pages-discard.xml b/tests/qemuxml2argvdata/pages-discard.xml
index a8c6b74d95d62af8a257e9b7884511635bac0484..adb718887a6b014dbb301fc9361e0e5184355e18 100644 (file)
--- a/tests/qemuxml2argvdata/pages-discard.xml
+++ b/tests/qemuxml2argvdata/pages-discard.xml
@@ -24,7 +24,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2argvdata/panic-double.args b/tests/qemuxml2argvdata/panic-double.args
index 7f49d3482efe0de54f6fe0a803d9380129d270b3..745efc7cf29d30f1768a6e3eacfdb6621fc2327e 100644 (file)
--- a/tests/qemuxml2argvdata/panic-double.args
+++ b/tests/qemuxml2argvdata/panic-double.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/panic-double.xml b/tests/qemuxml2argvdata/panic-double.xml
index 0e6d2ee71d241aafa40795396f661f8c141367ae..a4813c94ed000f128ff0951fd381ea5bdfeb8276 100644 (file)
--- a/tests/qemuxml2argvdata/panic-double.xml
+++ b/tests/qemuxml2argvdata/panic-double.xml
@@ -16,7 +16,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>

diff --git a/tests/qemuxml2argvdata/panic-isa.xml b/tests/qemuxml2argvdata/panic-isa.xml
index 25a9c72ed5f75ceaed257667b764a6b2abeead7d..34e8bd7a017bca9d2a0b5fe86063fdd310506942 100644 (file)
--- a/tests/qemuxml2argvdata/panic-isa.xml
+++ b/tests/qemuxml2argvdata/panic-isa.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/panic-no-address.args b/tests/qemuxml2argvdata/panic-no-address.args
index 71fa88cda11509bca673db37dca05ac265ee4b62..b4adee02bcb3f17ff7e409c209a7de7075c0bbb0 100644 (file)
--- a/tests/qemuxml2argvdata/panic-no-address.args
+++ b/tests/qemuxml2argvdata/panic-no-address.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/panic-no-address.xml b/tests/qemuxml2argvdata/panic-no-address.xml
index 0dc2e454de0d28a7bac5bc6359ef4d3eb326c0f3..1c79e65d76d00d8301f03a2cbc4c02d761898876 100644 (file)
--- a/tests/qemuxml2argvdata/panic-no-address.xml
+++ b/tests/qemuxml2argvdata/panic-no-address.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/panic.args b/tests/qemuxml2argvdata/panic.args
index de4d4497795d2fde9220014e958caed7091af3e8..51e107e1d056746b8090529c1ee6d3f6e8409451 100644 (file)
--- a/tests/qemuxml2argvdata/panic.args
+++ b/tests/qemuxml2argvdata/panic.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/panic.xml b/tests/qemuxml2argvdata/panic.xml
index a34b4f85f7319f77f33fb6c72d1af2a9fe7c74ae..2ceb11ac2a02b1e3c70c7c2af8adf89c3f979af0 100644 (file)
--- a/tests/qemuxml2argvdata/panic.xml
+++ b/tests/qemuxml2argvdata/panic.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.args b/tests/qemuxml2argvdata/parallel-parport-chardev.args
index d30b2fe0f46bf24e9fc086050582138303f061cb..c1b18521743a4e58e2da06b8cfc424a75ca79721 100644 (file)
--- a/tests/qemuxml2argvdata/parallel-parport-chardev.args
+++ b/tests/qemuxml2argvdata/parallel-parport-chardev.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.xml b/tests/qemuxml2argvdata/parallel-parport-chardev.xml
index 8fad75ab43e5c6632a3fdeade37fec03036ed09e..abd2a6fd4168e0b1fc9a3ce11eb5f0a619000f3b 100644 (file)
--- a/tests/qemuxml2argvdata/parallel-parport-chardev.xml
+++ b/tests/qemuxml2argvdata/parallel-parport-chardev.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/parallel-tcp-chardev.args b/tests/qemuxml2argvdata/parallel-tcp-chardev.args
index fd4f5ad81037999ae9d99a58682719f28f6d6acf..2ab87fb17a0ad29a769945e509b725a836c7ff38 100644 (file)
--- a/tests/qemuxml2argvdata/parallel-tcp-chardev.args
+++ b/tests/qemuxml2argvdata/parallel-tcp-chardev.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/parallel-tcp-chardev.xml b/tests/qemuxml2argvdata/parallel-tcp-chardev.xml
index 30fefa30a2809daed792622970fdff8a27d0980f..30573888e5eb7deba0d30de68b4693247077d243 100644 (file)
--- a/tests/qemuxml2argvdata/parallel-tcp-chardev.xml
+++ b/tests/qemuxml2argvdata/parallel-tcp-chardev.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/pci-bus-invalid.xml b/tests/qemuxml2argvdata/pci-bus-invalid.xml
index 21f1dc98af0534adc5e75362836fcf25568b6749..5884af6fc8d196875afff694f35f00e4fe47c5b0 100644 (file)
--- a/tests/qemuxml2argvdata/pci-bus-invalid.xml
+++ b/tests/qemuxml2argvdata/pci-bus-invalid.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/pci-domain-invalid.xml b/tests/qemuxml2argvdata/pci-domain-invalid.xml
index 21f1dc98af0534adc5e75362836fcf25568b6749..5884af6fc8d196875afff694f35f00e4fe47c5b0 100644 (file)
--- a/tests/qemuxml2argvdata/pci-domain-invalid.xml
+++ b/tests/qemuxml2argvdata/pci-domain-invalid.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/pci-function-invalid.xml b/tests/qemuxml2argvdata/pci-function-invalid.xml
index 6254027ab12f0ef0e1fbdc4b1779568236c24563..5642809ec022b4873afc6c10fd7d1d698465e3e9 100644 (file)
--- a/tests/qemuxml2argvdata/pci-function-invalid.xml
+++ b/tests/qemuxml2argvdata/pci-function-invalid.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/pci-rom.args b/tests/qemuxml2argvdata/pci-rom.args
index 4a5dc4161a2a977a39b2e33417785b99fa9d2e97..d82e1d047bd2649f16945ad5a3faaf21f3de2493 100644 (file)
--- a/tests/qemuxml2argvdata/pci-rom.args
+++ b/tests/qemuxml2argvdata/pci-rom.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest2 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/pci-rom.xml b/tests/qemuxml2argvdata/pci-rom.xml
index 09cafb35a9c129a6e77def05480f8badadd8e9cc..2e8ea4bde335c1f7abfcf6d5a95b095f6fec1390 100644 (file)
--- a/tests/qemuxml2argvdata/pci-rom.xml
+++ b/tests/qemuxml2argvdata/pci-rom.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest2'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
index 4889e5b83e840cd5897aad2432fca6a2b0a92ca0..92858a21673cbb0fa9dbe929d40bb39f6902dbd3 100644 (file)
--- a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
+++ b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/pci-serial-dev-chardev.xml b/tests/qemuxml2argvdata/pci-serial-dev-chardev.xml
index a9b35318e126814eafc08c26812228451a5887f3..c4d73a86c80d0eaf5888ef93b733be125586032b 100644 (file)
--- a/tests/qemuxml2argvdata/pci-serial-dev-chardev.xml
+++ b/tests/qemuxml2argvdata/pci-serial-dev-chardev.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/pci-slot-invalid.xml b/tests/qemuxml2argvdata/pci-slot-invalid.xml
index 77c3acf3db7e8979c7c34c5a00ea00395189d746..0c4a2daef25de6d538d0df722b4456ea2d6cba3a 100644 (file)
--- a/tests/qemuxml2argvdata/pci-slot-invalid.xml
+++ b/tests/qemuxml2argvdata/pci-slot-invalid.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/pmu-feature-off.args b/tests/qemuxml2argvdata/pmu-feature-off.args
index a392959902db231cbea0559ac0a463d3523a9b55..37ab3eacb14f5b1a2d099e2df743a72cd28319b3 100644 (file)
--- a/tests/qemuxml2argvdata/pmu-feature-off.args
+++ b/tests/qemuxml2argvdata/pmu-feature-off.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/pmu-feature-off.xml b/tests/qemuxml2argvdata/pmu-feature-off.xml
index d7a45bfb4a9e6b872742c2515551e3215cd3c5af..17e1fec9541d598b65dc426988b7d4c2cc79dc78 100644 (file)
--- a/tests/qemuxml2argvdata/pmu-feature-off.xml
+++ b/tests/qemuxml2argvdata/pmu-feature-off.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>

diff --git a/tests/qemuxml2argvdata/pmu-feature.args b/tests/qemuxml2argvdata/pmu-feature.args
index f8682204c367bbc7a73894a58c79e76999e5a66c..b0ac52367829b000112982f67fc08837b51d2f39 100644 (file)
--- a/tests/qemuxml2argvdata/pmu-feature.args
+++ b/tests/qemuxml2argvdata/pmu-feature.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/pmu-feature.xml b/tests/qemuxml2argvdata/pmu-feature.xml
index de9068e7ec3e8acaa29d27308e6d2b222b322175..a7f43392a40b8048938f071402185cdbd3727760 100644 (file)
--- a/tests/qemuxml2argvdata/pmu-feature.xml
+++ b/tests/qemuxml2argvdata/pmu-feature.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <memballoon model='none'/>

diff --git a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args
index 5e8f4f62e47bdf47ae86b029c015390bf4db50e3..7e3c90e4672ee5a3109e0345cf567ac619a316c1 100644 (file)
--- a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args
+++ b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args
index 4c7414400e67c6358ebf6706ae4556ebb4a42d20..76e439c2b4eafdd4392992ea0a4f6e6e71605e96 100644 (file)
--- a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args
+++ b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args
index 13fd7253a91041412959b53970247b42a8cb22e4..6f07b3268502f9683e39463bcc5eb98291fb47f9 100644 (file)
--- a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/pv-spinlock-disabled.xml b/tests/qemuxml2argvdata/pv-spinlock-disabled.xml
index 40e3aab192c89a64106c3fd2acd0772324e0561d..e3212313bb275c9298955b101cac7a6b3839c5fb 100644 (file)
--- a/tests/qemuxml2argvdata/pv-spinlock-disabled.xml
+++ b/tests/qemuxml2argvdata/pv-spinlock-disabled.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>

diff --git a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args
index 79e097e5542c5b6c90c415c01e96a6088bc83860..c5d00952425074c016463e6551ce308f03dddc1f 100644 (file)
--- a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args
+++ b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args
index b8a100767580048a3407666e0f787ac6217c9444..e19ebfda0bafd63f0066eba964214604362f8416 100644 (file)
--- a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args
+++ b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args
index 919bbd037ecb5b758522bb5c3c3c480b3c3c5cb8..ad8dffc9e57702a0d20547dbd2575f614d2042d8 100644 (file)
--- a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/pv-spinlock-enabled.xml b/tests/qemuxml2argvdata/pv-spinlock-enabled.xml
index 7bdda8e7487c648c211c48e6bb4c8cf57e149db9..531480d4b3c88ddf5bfe90838aea4d464788ca79 100644 (file)
--- a/tests/qemuxml2argvdata/pv-spinlock-enabled.xml
+++ b/tests/qemuxml2argvdata/pv-spinlock-enabled.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>

diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.args b/tests/qemuxml2argvdata/qemu-ns-alt.args
index ad858b3da168eb9ddd5f9aa98ac58440eed6c262..7e4cffa4d0b65fd02b85213f2f53e2a2af9eb440 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns-alt.args
+++ b/tests/qemuxml2argvdata/qemu-ns-alt.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 NS=ns \
 BAR='' \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.xml b/tests/qemuxml2argvdata/qemu-ns-alt.xml
index 491fc2d80b68804afded20ae87327a51ba143a0a..6b8b5ba36bdfc8d30e59ab1398a6ed1df35f05cc 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns-alt.xml
+++ b/tests/qemuxml2argvdata/qemu-ns-alt.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
index b7798e68e7c07b7c5c5409165ceefdcb511e7097..fc1592f1689bd63fdfdf366e263a93ed59ed0068 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.xml b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.xml
index 293f993d2a3ef5539bfc31bed594f4b7e6cda76c..91899271266498443caf5cd60bf408afafbce6c2 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.xml
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
index b7798e68e7c07b7c5c5409165ceefdcb511e7097..fc1592f1689bd63fdfdf366e263a93ed59ed0068 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.xml b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.xml
index e7b9deca477fed0a2b14de2bcaa5a37bbe473f2d..e98d7773092dfe030de1ee9f15c1fad0b220dbec 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.xml
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.args b/tests/qemuxml2argvdata/qemu-ns-commandline.args
index b7798e68e7c07b7c5c5409165ceefdcb511e7097..fc1592f1689bd63fdfdf366e263a93ed59ed0068 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns-commandline.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.xml b/tests/qemuxml2argvdata/qemu-ns-commandline.xml
index c70d6854fbf5b8882bc8b7267f4e056870faa0cd..25f83acb12b97a0716c79886580e72a51b039625 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns-commandline.xml
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
index b7798e68e7c07b7c5c5409165ceefdcb511e7097..fc1592f1689bd63fdfdf366e263a93ed59ed0068 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.xml b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.xml
index bbb62efefc8c2a0740b25ab1d22f48c9929950ab..9c25329b051a2d83fc788346c944b5c672d98f9d 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.xml
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
index b7798e68e7c07b7c5c5409165ceefdcb511e7097..fc1592f1689bd63fdfdf366e263a93ed59ed0068 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.xml b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.xml
index 377e0de375d83824a238bd8da666043d83482fdb..65a688fb78e164fe675d81ae35073ebf7b252e04 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.xml
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
index b7798e68e7c07b7c5c5409165ceefdcb511e7097..fc1592f1689bd63fdfdf366e263a93ed59ed0068 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.xml b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.xml
index 5c5f00fbfc981eb430b9b9c2af0edde6b5ea841b..a5d3ec0b025cd785d27111482b9dbe3458eddb9c 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.xml
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.args b/tests/qemuxml2argvdata/qemu-ns-no-env.args
index 897162a8d98bea53dd2d0f97c751b9d49381b984..74f7b887610c26c959bae7bd63c97cb12367c599 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns-no-env.args
+++ b/tests/qemuxml2argvdata/qemu-ns-no-env.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.xml b/tests/qemuxml2argvdata/qemu-ns-no-env.xml
index 57c7d7afd06bb3a2d8fd0d2f7b7dcf8c2854de49..3dad42eeadb3936bb9ce6148574701087c071446 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns-no-env.xml
+++ b/tests/qemuxml2argvdata/qemu-ns-no-env.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args b/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args
index 2f49af885bf09f303adabb6d34124461bfecda0a..0f3253f8316890cd296006565a66f8039ac26604 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args
+++ b/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 NS=ns \
 BAR='' \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args b/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args
index f898ab2e07bfe6e1a090b4c7cb8ba48e6bf7829f..51ba863a5fe5f3a07bf01f53ee87e12e00e32ae4 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 NS=ns \
 BAR='' \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/qemu-ns.xml b/tests/qemuxml2argvdata/qemu-ns.xml
index 02cbf4bbd92e4b4ed3a97df599b59935adf290d8..515d4fabec627ebed53d9554375e19d18791414b 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns.xml
+++ b/tests/qemuxml2argvdata/qemu-ns.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.args b/tests/qemuxml2argvdata/reboot-timeout-disabled.args
index d5973b41922f0b7d40e726dc5b86f32d84d58463..1ddc18b7c56e9faa4f417af5c1ff8160b500e7ec 100644 (file)
--- a/tests/qemuxml2argvdata/reboot-timeout-disabled.args
+++ b/tests/qemuxml2argvdata/reboot-timeout-disabled.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.xml b/tests/qemuxml2argvdata/reboot-timeout-disabled.xml
index 8af83c5a42c8992bd029df7be625862a72f1fdf2..a815b4b2746ed58a33a5bbb4c4a35b06a92f246c 100644 (file)
--- a/tests/qemuxml2argvdata/reboot-timeout-disabled.xml
+++ b/tests/qemuxml2argvdata/reboot-timeout-disabled.xml
@@ -14,7 +14,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>

diff --git a/tests/qemuxml2argvdata/reboot-timeout-enabled.args b/tests/qemuxml2argvdata/reboot-timeout-enabled.args
index 34774b76af7ac44fb7d1b321056483f23cc5a0b9..e31f37e11232b9b201aaec8a900142fdcec4e76e 100644 (file)
--- a/tests/qemuxml2argvdata/reboot-timeout-enabled.args
+++ b/tests/qemuxml2argvdata/reboot-timeout-enabled.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/reboot-timeout-enabled.xml b/tests/qemuxml2argvdata/reboot-timeout-enabled.xml
index 663ed692cd0af82c5a0dc62f01a87b68138fe584..4554f8532396bc0c313e25e059a0ba9c22aa46bf 100644 (file)
--- a/tests/qemuxml2argvdata/reboot-timeout-enabled.xml
+++ b/tests/qemuxml2argvdata/reboot-timeout-enabled.xml
@@ -14,7 +14,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>

diff --git a/tests/qemuxml2argvdata/restore-v2-fd.args b/tests/qemuxml2argvdata/restore-v2-fd.args
index 70f0b40f34d7952142c06ad53952e2c9d8579f12..cc0a7514830eff97fbac9d01287fd701d5e57a2b 100644 (file)
--- a/tests/qemuxml2argvdata/restore-v2-fd.args
+++ b/tests/qemuxml2argvdata/restore-v2-fd.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/restore-v2-fd.xml b/tests/qemuxml2argvdata/restore-v2-fd.xml
index 2e009be5fa36d76cee4f90989b32d2d1e1dad237..f56ba5a1e797c902033b565a0a2f45055687ab69 100644 (file)
--- a/tests/qemuxml2argvdata/restore-v2-fd.xml
+++ b/tests/qemuxml2argvdata/restore-v2-fd.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/restore-v2.args b/tests/qemuxml2argvdata/restore-v2.args
index 54cae8096c888ba72b00b1c8a22d14207baae41b..ac3d16f3c3744a6e92418e35af546d7f35c90ea2 100644 (file)
--- a/tests/qemuxml2argvdata/restore-v2.args
+++ b/tests/qemuxml2argvdata/restore-v2.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/restore-v2.xml b/tests/qemuxml2argvdata/restore-v2.xml
index be60ddcbe53e99c18cf6a0405b87994215dbdc62..7b4ea974ebc12a3a81b2e20777ac6f584a9b74f5 100644 (file)
--- a/tests/qemuxml2argvdata/restore-v2.xml
+++ b/tests/qemuxml2argvdata/restore-v2.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.args b/tests/qemuxml2argvdata/seclabel-dac-none.args
index 3a1f010e3ef9897b8cbb995853463b94888a353a..60253f43ec6e495558d004e3a22e50194b3fde10 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-dac-none.args
+++ b/tests/qemuxml2argvdata/seclabel-dac-none.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.xml b/tests/qemuxml2argvdata/seclabel-dac-none.xml
index e76e2906f5e3fe4d6a71378ff3896b5a08eb00f1..cf1b1d557ec61ed97f07a2019db1a8a03685c26f 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-dac-none.xml
+++ b/tests/qemuxml2argvdata/seclabel-dac-none.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/seclabel-device-duplicates.xml b/tests/qemuxml2argvdata/seclabel-device-duplicates.xml
index 0b65f4397c697c33b1bc256c46c020c6b756a31c..100c67ce5f08ac797373475755a1e449665dc2b6 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-device-duplicates.xml
+++ b/tests/qemuxml2argvdata/seclabel-device-duplicates.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'>
         <seclabel model='selinux' relabel='no'/>

diff --git a/tests/qemuxml2argvdata/seclabel-device-multiple.xml b/tests/qemuxml2argvdata/seclabel-device-multiple.xml
index 5ad10df2fe4d03907c8e9a7d4bb8b18e284024ef..cf3d3c04eebdf070c1e27ac8b1f3a37edb3c8ed8 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-device-multiple.xml
+++ b/tests/qemuxml2argvdata/seclabel-device-multiple.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'>
         <seclabel model='selinux' relabel='yes'>

diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
index 3a1f010e3ef9897b8cbb995853463b94888a353a..60253f43ec6e495558d004e3a22e50194b3fde10 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.xml b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.xml
index 915cf9d86960a21d8e8eb632ae6b0e76bef43180..cfebf7720d24afa01ba3fc179df6aeb5302b29c6 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.xml
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
index 3a1f010e3ef9897b8cbb995853463b94888a353a..60253f43ec6e495558d004e3a22e50194b3fde10 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.xml b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.xml
index 63b21b526184ceb3aab782699b0a95c186ff97db..11b52e2998ecfe88eacc4923f467a4c3f641669c 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.xml
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'>
         <seclabel model='selinux' labelskip='yes'/>

diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-none.xml b/tests/qemuxml2argvdata/seclabel-dynamic-none.xml
index 265bc36df73ed0a82b41f08c3e5fd6e124d2f564..ec75535c0e7a45968dab3b9fd9c7543f9335e20e 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-dynamic-none.xml
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-none.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.args b/tests/qemuxml2argvdata/seclabel-dynamic-override.args
index a0cdc581c92ec0cf41acb127cf559754c3b4d40c..b561a7713990214edca93563ece714f835f52bea 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-dynamic-override.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.xml b/tests/qemuxml2argvdata/seclabel-dynamic-override.xml
index 39dd3b78d47298efbc26b48d416431e3b31f7cc9..4946f2f0c0bf2d3ba0b7b5a975df7a0db0451fd9 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-dynamic-override.xml
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'>
         <seclabel model='selinux' relabel='no'/>

diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
index 3a1f010e3ef9897b8cbb995853463b94888a353a..60253f43ec6e495558d004e3a22e50194b3fde10 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.xml b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.xml
index ede8440b673c1c977f1712a4bbc09ace88e8fc83..db97b92d06155c876724a0b76e1179fc21d277aa 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.xml
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.args b/tests/qemuxml2argvdata/seclabel-dynamic.args
index 3a1f010e3ef9897b8cbb995853463b94888a353a..60253f43ec6e495558d004e3a22e50194b3fde10 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-dynamic.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.xml b/tests/qemuxml2argvdata/seclabel-dynamic.xml
index 9b017e730b5166fb191918bcd0f27738236e2d64..f6586062da7278f703397883c0441e4b281162e5 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-dynamic.xml
+++ b/tests/qemuxml2argvdata/seclabel-dynamic.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/seclabel-multiple.xml b/tests/qemuxml2argvdata/seclabel-multiple.xml
index f31ea74a91f0b11cb27cd615038e7e7d3cd02ffe..9fe7bdd8dfb4bf5b2c35ae57bbf4547324e4f027 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-multiple.xml
+++ b/tests/qemuxml2argvdata/seclabel-multiple.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'>
         <seclabel model='selinux' labelskip='yes'/>

diff --git a/tests/qemuxml2argvdata/seclabel-none.args b/tests/qemuxml2argvdata/seclabel-none.args
index 3a1f010e3ef9897b8cbb995853463b94888a353a..60253f43ec6e495558d004e3a22e50194b3fde10 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-none.args
+++ b/tests/qemuxml2argvdata/seclabel-none.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/seclabel-none.xml b/tests/qemuxml2argvdata/seclabel-none.xml
index 3f4e9d78657ab694041122c883790bb84f8bb273..03fc36443a01c3d1ef789ca4db345ced26aded9b 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-none.xml
+++ b/tests/qemuxml2argvdata/seclabel-none.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.args b/tests/qemuxml2argvdata/seclabel-static-labelskip.args
index 3a1f010e3ef9897b8cbb995853463b94888a353a..60253f43ec6e495558d004e3a22e50194b3fde10 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-static-labelskip.args
+++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.xml b/tests/qemuxml2argvdata/seclabel-static-labelskip.xml
index a52b423ea312d5de0bc9f30ced40f87412a9ff84..5d357acd66c2332558e25af161d5e48b1e235c94 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-static-labelskip.xml
+++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'>
         <seclabel model='selinux' labelskip='yes'/>

diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.args b/tests/qemuxml2argvdata/seclabel-static-relabel.args
index 3a1f010e3ef9897b8cbb995853463b94888a353a..60253f43ec6e495558d004e3a22e50194b3fde10 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-static-relabel.args
+++ b/tests/qemuxml2argvdata/seclabel-static-relabel.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.xml b/tests/qemuxml2argvdata/seclabel-static-relabel.xml
index eb00b9fdcd9a0285fc9b83727a1daf5788e85b5f..dd8995bb28e32557526da2315fce352daa6d92c7 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-static-relabel.xml
+++ b/tests/qemuxml2argvdata/seclabel-static-relabel.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/seclabel-static.args b/tests/qemuxml2argvdata/seclabel-static.args
index 3a1f010e3ef9897b8cbb995853463b94888a353a..60253f43ec6e495558d004e3a22e50194b3fde10 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-static.args
+++ b/tests/qemuxml2argvdata/seclabel-static.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/seclabel-static.xml b/tests/qemuxml2argvdata/seclabel-static.xml
index 9e9a5246daaf83d9073a29b9cf1c909b337f0270..a5d4c007e856ed66af5fb58b7d0e279df8a5ecbf 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-static.xml
+++ b/tests/qemuxml2argvdata/seclabel-static.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
index 9c4211e25a1dec7c932b5b49eb7416ed3c755302..239c13167d3deb2d10645b203338b39702840be7 100644 (file)
--- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
+++ b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.xml b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.xml
index 3c847989bd0a781ce6cae3db54a5d8c6a10576d8..559910af8ab6de74d6af8b8a8a8bc5de4bb65131 100644 (file)
--- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.xml
+++ b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.args b/tests/qemuxml2argvdata/serial-dev-chardev.args
index 32c41d63e2e0a0ecaf754e1831a7e9a060cd02a2..96053f22c3e5e09624426ac07b2405ab0f17e816 100644 (file)
--- a/tests/qemuxml2argvdata/serial-dev-chardev.args
+++ b/tests/qemuxml2argvdata/serial-dev-chardev.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.xml b/tests/qemuxml2argvdata/serial-dev-chardev.xml
index dffd27d063201e128ef8d974ee0abb144adb81af..7cf428fb17f018eb03cb62df345c8ac47bbdeb99 100644 (file)
--- a/tests/qemuxml2argvdata/serial-dev-chardev.xml
+++ b/tests/qemuxml2argvdata/serial-dev-chardev.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/serial-file-chardev.args b/tests/qemuxml2argvdata/serial-file-chardev.args
index ea16446da712b787ae6363edb9c82445aaffe4db..435b9eb689fba169f038bb394a6e49ea7a50d44c 100644 (file)
--- a/tests/qemuxml2argvdata/serial-file-chardev.args
+++ b/tests/qemuxml2argvdata/serial-file-chardev.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/serial-file-chardev.xml b/tests/qemuxml2argvdata/serial-file-chardev.xml
index fe0a5f8fbd3d4c18b3990f01f3d031c4397cb96a..f90d0dd5efb6f782c1f920149f44860b8bc51db0 100644 (file)
--- a/tests/qemuxml2argvdata/serial-file-chardev.xml
+++ b/tests/qemuxml2argvdata/serial-file-chardev.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/serial-file-log.args b/tests/qemuxml2argvdata/serial-file-log.args
index 72c50707863f3a0a71504d9de5ecc63954bdd11a..35334297ff577b93d05d8ee3dd7e109dd56318eb 100644 (file)
--- a/tests/qemuxml2argvdata/serial-file-log.args
+++ b/tests/qemuxml2argvdata/serial-file-log.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/serial-file-log.xml b/tests/qemuxml2argvdata/serial-file-log.xml
index 319772dd67e94957e4cefaae1dac4e5fff69aa6b..01d529b5efb5847ae761da70730cd1d3a0b1ec70 100644 (file)
--- a/tests/qemuxml2argvdata/serial-file-log.xml
+++ b/tests/qemuxml2argvdata/serial-file-log.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/serial-many-chardev.args b/tests/qemuxml2argvdata/serial-many-chardev.args
index 80e5dc3523c3783d318540f0612a0a99dd3a2182..31800b30ffb71fdb4eceffc762ad6f6b9628badd 100644 (file)
--- a/tests/qemuxml2argvdata/serial-many-chardev.args
+++ b/tests/qemuxml2argvdata/serial-many-chardev.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/serial-many-chardev.xml b/tests/qemuxml2argvdata/serial-many-chardev.xml
index 034ad45fd6c5337ca06d8876ac9b14d0fe368011..c486a64fd7f4ec297d9bb18572520ea7f9faf1ec 100644 (file)
--- a/tests/qemuxml2argvdata/serial-many-chardev.xml
+++ b/tests/qemuxml2argvdata/serial-many-chardev.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/serial-pty-chardev.args b/tests/qemuxml2argvdata/serial-pty-chardev.args
index 683399d307b0c2297a100d298bbbc9a0663eb590..4d6d6e376cc5aac1dc1f271b486ad73c6ec91636 100644 (file)
--- a/tests/qemuxml2argvdata/serial-pty-chardev.args
+++ b/tests/qemuxml2argvdata/serial-pty-chardev.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/serial-pty-chardev.xml b/tests/qemuxml2argvdata/serial-pty-chardev.xml
index db5782ec50b5c43138b52a53311e531abc4f590f..82fbb3a23f355ef078cc8d77c38467c9affc3221 100644 (file)
--- a/tests/qemuxml2argvdata/serial-pty-chardev.xml
+++ b/tests/qemuxml2argvdata/serial-pty-chardev.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/serial-spiceport-nospice.args b/tests/qemuxml2argvdata/serial-spiceport-nospice.args
index 3a1f010e3ef9897b8cbb995853463b94888a353a..60253f43ec6e495558d004e3a22e50194b3fde10 100644 (file)
--- a/tests/qemuxml2argvdata/serial-spiceport-nospice.args
+++ b/tests/qemuxml2argvdata/serial-spiceport-nospice.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/serial-spiceport-nospice.xml b/tests/qemuxml2argvdata/serial-spiceport-nospice.xml
index 3c4be0cdcb8f824ac32132e5dc1a1c0dcf52a546..0c1aeab8180fd5a8f45a3926937ca577f7f484f7 100644 (file)
--- a/tests/qemuxml2argvdata/serial-spiceport-nospice.xml
+++ b/tests/qemuxml2argvdata/serial-spiceport-nospice.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/serial-spiceport.args b/tests/qemuxml2argvdata/serial-spiceport.args
index e1ba3893ccb48f11e74041d2fa523a4ee5201cbb..6e3d4e4ea0e87e0870054c17a1e4667b02d115f9 100644 (file)
--- a/tests/qemuxml2argvdata/serial-spiceport.args
+++ b/tests/qemuxml2argvdata/serial-spiceport.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=spice \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/serial-spiceport.xml b/tests/qemuxml2argvdata/serial-spiceport.xml
index e0a6126d5cd51e46c732fa93a6f982a48838357a..46a0bf7db476283c8c92896ab3c152502670451d 100644 (file)
--- a/tests/qemuxml2argvdata/serial-spiceport.xml
+++ b/tests/qemuxml2argvdata/serial-spiceport.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/serial-target-port-auto.xml b/tests/qemuxml2argvdata/serial-target-port-auto.xml
index 98f39f32119f7127ac4c0a5eae4c59e0d615db92..9f9ba502b3f7156e7bb4ae1505f33af75ec72f5a 100644 (file)
--- a/tests/qemuxml2argvdata/serial-target-port-auto.xml
+++ b/tests/qemuxml2argvdata/serial-target-port-auto.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/serial-tcp-chardev.args b/tests/qemuxml2argvdata/serial-tcp-chardev.args
index 78d55ad39d63bf9b3ef5e291015e81fa54c6d786..dd91391343d54fe59178ad60adac4d4902ec096a 100644 (file)
--- a/tests/qemuxml2argvdata/serial-tcp-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-chardev.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/serial-tcp-chardev.xml b/tests/qemuxml2argvdata/serial-tcp-chardev.xml
index 09cd68f14ea639aa453a285c7f258a1a47d2f3af..f19225dc47a2a43e6d768b11c764acffba390c36 100644 (file)
--- a/tests/qemuxml2argvdata/serial-tcp-chardev.xml
+++ b/tests/qemuxml2argvdata/serial-tcp-chardev.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
index 60c7eb8b9c82be7905e3e6be71040158a210fac0..a372863fa78b6433c1eb767e891319dc80c2213c 100644 (file)
--- a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.xml b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.xml
index 79987aabdf06683d58c539a574ca57227160da87..48a3c00183f805036825f36cdcd0ad02482d3821 100644 (file)
--- a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.xml
+++ b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
index c750df077df62a779ed664d97fce444cfc8d337c..c08869bd491907d5682f5196aa0c777eb04d9bd5 100644 (file)
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml
index ddda2c62b9a44ee25e3726c308e75dc9634b8da9..7a834f83a2013bbacddc2c337157e6679efafbb0 100644 (file)
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
index 3538686f1a5605b64a6e9231c26c3d024e09c5cf..c84e58eef3f74cbf43b0c33517c29f5824194cb4 100644 (file)
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.xml b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.xml
index 7e9af60ee0d981c01f963609c3c0325ffb8589d7..75c6c7f5f46000463dca642d7123b9b4a89be3ad 100644 (file)
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.xml
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
index 3538686f1a5605b64a6e9231c26c3d024e09c5cf..c84e58eef3f74cbf43b0c33517c29f5824194cb4 100644 (file)
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.xml b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.xml
index 7e9af60ee0d981c01f963609c3c0325ffb8589d7..75c6c7f5f46000463dca642d7123b9b4a89be3ad 100644 (file)
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.xml
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
index 495e16856397f695fc005c8c6e7ac788bf7a46cb..051c8abc14b26b7e65679206e83bcdc475ab8a88 100644 (file)
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.xml b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.xml
index 18f51e53836d4bec32d8821d155842b75f26a4d5..670f282b8483daec47d7e2d6240b397175c56193 100644 (file)
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.xml
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/serial-udp-chardev.args b/tests/qemuxml2argvdata/serial-udp-chardev.args
index 9e24ca713e332580982d98d275164118718ed7a0..27fda9241839100cef63fad4fd6d879d4bf46300 100644 (file)
--- a/tests/qemuxml2argvdata/serial-udp-chardev.args
+++ b/tests/qemuxml2argvdata/serial-udp-chardev.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/serial-udp-chardev.xml b/tests/qemuxml2argvdata/serial-udp-chardev.xml
index 420daadb5638ea87835e2fda733094dfa2e0aa34..15f65fbe87db93fde2c13637c641cb76d53fc4e1 100644 (file)
--- a/tests/qemuxml2argvdata/serial-udp-chardev.xml
+++ b/tests/qemuxml2argvdata/serial-udp-chardev.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.args b/tests/qemuxml2argvdata/serial-unix-chardev.args
index 2b6683f8438c66a6d56be37a151cd29b4fdbe170..26998323ff9ee6d4f7e4c1da780d4b74c18b78d1 100644 (file)
--- a/tests/qemuxml2argvdata/serial-unix-chardev.args
+++ b/tests/qemuxml2argvdata/serial-unix-chardev.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args
index 4c9b1fefea4c007bc74ef140ac9b51296b3f97ff..3e42d2577b9376ed4153b0175b2c13dbfc698ea8 100644 (file)
--- a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.xml b/tests/qemuxml2argvdata/serial-unix-chardev.xml
index f977d4d25c99a7c0d182942eb372a45e973f1f5b..18a7fac5746bc54a833477a09677e62035ea0f43 100644 (file)
--- a/tests/qemuxml2argvdata/serial-unix-chardev.xml
+++ b/tests/qemuxml2argvdata/serial-unix-chardev.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <serial type='unix'>

diff --git a/tests/qemuxml2argvdata/serial-vc-chardev.args b/tests/qemuxml2argvdata/serial-vc-chardev.args
index e49968e2ad5057534d88010b1b48c46c570a890a..f5a5bab576e1ffbf7410e2ce90eeef77533d1970 100644 (file)
--- a/tests/qemuxml2argvdata/serial-vc-chardev.args
+++ b/tests/qemuxml2argvdata/serial-vc-chardev.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/serial-vc-chardev.xml b/tests/qemuxml2argvdata/serial-vc-chardev.xml
index b84cdbe77b8c618f00cc85a73843a31d9bad110e..9c056cb40169a96b6acbb90d59f12768b923f6d1 100644 (file)
--- a/tests/qemuxml2argvdata/serial-vc-chardev.xml
+++ b/tests/qemuxml2argvdata/serial-vc-chardev.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/shmem-invalid-address.xml b/tests/qemuxml2argvdata/shmem-invalid-address.xml
index 6a4645fff21abaa2be3984445ad1830fa1cc48d2..1eef5ed540550b1520201b538de97efa24a3374e 100644 (file)
--- a/tests/qemuxml2argvdata/shmem-invalid-address.xml
+++ b/tests/qemuxml2argvdata/shmem-invalid-address.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <memballoon model='none'/>

diff --git a/tests/qemuxml2argvdata/shmem-invalid-size.xml b/tests/qemuxml2argvdata/shmem-invalid-size.xml
index f7096dc1a99494062364a64ca36aacd80195b1a4..e9a383de21e86c0870198f54ea5368cbcfa5155c 100644 (file)
--- a/tests/qemuxml2argvdata/shmem-invalid-size.xml
+++ b/tests/qemuxml2argvdata/shmem-invalid-size.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <memballoon model='none'/>

diff --git a/tests/qemuxml2argvdata/shmem-msi-only.xml b/tests/qemuxml2argvdata/shmem-msi-only.xml
index f4c61ad4fa829fc4e4b2b258bb11f3f9697bf499..6c8025d63b4ce61b98aa6572f0c081708ee12f96 100644 (file)
--- a/tests/qemuxml2argvdata/shmem-msi-only.xml
+++ b/tests/qemuxml2argvdata/shmem-msi-only.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <memballoon model='none'/>

diff --git a/tests/qemuxml2argvdata/shmem-plain-doorbell.args b/tests/qemuxml2argvdata/shmem-plain-doorbell.args
index 836d24447431d0e25ac28e62d75cfd1d7df5d856..6ed86b7448ecf4b743da92f15000cce1e00be048 100644 (file)
--- a/tests/qemuxml2argvdata/shmem-plain-doorbell.args
+++ b/tests/qemuxml2argvdata/shmem-plain-doorbell.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/shmem-plain-doorbell.xml b/tests/qemuxml2argvdata/shmem-plain-doorbell.xml
index 32f6098ff40191413b69a52064c2ee876366de40..e248d637a58c0b435356cdfd611bf712ceb7d2d6 100644 (file)
--- a/tests/qemuxml2argvdata/shmem-plain-doorbell.xml
+++ b/tests/qemuxml2argvdata/shmem-plain-doorbell.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>

diff --git a/tests/qemuxml2argvdata/shmem-small-size.xml b/tests/qemuxml2argvdata/shmem-small-size.xml
index 32e1e220a1e2286465b1ce09e18e578ab795ff60..7236f64577caf1e1c5cc17e5da1d5aeec13b5d6d 100644 (file)
--- a/tests/qemuxml2argvdata/shmem-small-size.xml
+++ b/tests/qemuxml2argvdata/shmem-small-size.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <memballoon model='none'/>

diff --git a/tests/qemuxml2argvdata/shmem.args b/tests/qemuxml2argvdata/shmem.args
index 685bbaf8246653af41eb0d147b6f6f0912ba770e..f2f3c3e95d42d0bb54e75ef928140585a9b4e355 100644 (file)
--- a/tests/qemuxml2argvdata/shmem.args
+++ b/tests/qemuxml2argvdata/shmem.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/shmem.xml b/tests/qemuxml2argvdata/shmem.xml
index f37b82fb7784211b956d53fdd76719bb83999b95..e09f6da7809b64c75c7fc7a13a6aaaf461f21c6d 100644 (file)
--- a/tests/qemuxml2argvdata/shmem.xml
+++ b/tests/qemuxml2argvdata/shmem.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>

diff --git a/tests/qemuxml2argvdata/smartcard-controller.args b/tests/qemuxml2argvdata/smartcard-controller.args
index 744370ba4d8e35d25d34b074a2697ed1f1ef394b..7e9442045d9bf106ca8c856415c96d6ad75f475f 100644 (file)
--- a/tests/qemuxml2argvdata/smartcard-controller.args
+++ b/tests/qemuxml2argvdata/smartcard-controller.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/smartcard-controller.xml b/tests/qemuxml2argvdata/smartcard-controller.xml
index 06a1bab385c3c66744bf95425b59b645d8b6ac9f..31834ec4e8adfc2c75eeaea3875f3795449b71d1 100644 (file)
--- a/tests/qemuxml2argvdata/smartcard-controller.xml
+++ b/tests/qemuxml2argvdata/smartcard-controller.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='ccid' index='0'/>
     <smartcard mode='host'>
       <address type='ccid' controller='0' slot='0'/>

diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
index 29da01ac06b5665f27b0cf9eb011cfefc174cced..938164966804e250bf1eeaf6fa132fa0e0d613fb 100644 (file)
--- a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
+++ b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.xml b/tests/qemuxml2argvdata/smartcard-host-certificates-database.xml
index fa356457367b03bc17f204161d4fb862a5e785c2..10d4521b98334fa22831a426196e8a1f1e0b68bf 100644 (file)
--- a/tests/qemuxml2argvdata/smartcard-host-certificates-database.xml
+++ b/tests/qemuxml2argvdata/smartcard-host-certificates-database.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <smartcard mode='host-certificates'>
       <certificate>cert1</certificate>
       <certificate>cert2</certificate>

diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.args b/tests/qemuxml2argvdata/smartcard-host-certificates.args
index 0570b34f709f3dfe1fd8112d4706b1a00c7fbb50..eecc454343b4cf20b104cdc97c6dd564376b2484 100644 (file)
--- a/tests/qemuxml2argvdata/smartcard-host-certificates.args
+++ b/tests/qemuxml2argvdata/smartcard-host-certificates.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.xml b/tests/qemuxml2argvdata/smartcard-host-certificates.xml
index 64babee9af330eeb12fe4016ef82c29327679bcb..093cdb68c2f52258324424eed157eb122c188068 100644 (file)
--- a/tests/qemuxml2argvdata/smartcard-host-certificates.xml
+++ b/tests/qemuxml2argvdata/smartcard-host-certificates.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <smartcard mode='host-certificates'>
       <certificate>cert1</certificate>
       <certificate>cert2</certificate>

diff --git a/tests/qemuxml2argvdata/smartcard-host.args b/tests/qemuxml2argvdata/smartcard-host.args
index 744370ba4d8e35d25d34b074a2697ed1f1ef394b..7e9442045d9bf106ca8c856415c96d6ad75f475f 100644 (file)
--- a/tests/qemuxml2argvdata/smartcard-host.args
+++ b/tests/qemuxml2argvdata/smartcard-host.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/smartcard-host.xml b/tests/qemuxml2argvdata/smartcard-host.xml
index fe2b0530b6f5ea84d79ad7881534dadcd022779e..4b3827fb80ccb8a96d77c9aedbc48743ea95eb6a 100644 (file)
--- a/tests/qemuxml2argvdata/smartcard-host.xml
+++ b/tests/qemuxml2argvdata/smartcard-host.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <smartcard mode='host'/>
     <memballoon model='virtio'/>
   </devices>

diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
index 16a3bad057d782e90b527f6001b40c56a887ccfb..983648a21f293292c4fcf2d025c14d5abf1772c8 100644 (file)
--- a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.xml b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.xml
index e97441e791727c63ed9e359e31821d5b380319ae..c0baa1e34bc4454991ef0a10adaadc1e9d83f500 100644 (file)
--- a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.xml
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <smartcard mode='passthrough' type='spicevmc'/>
     <memballoon model='virtio'/>
   </devices>

diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
index a4dca17c3e2b22ced4e0c2dbbd4c72596aaf8004..bac4418803d5aae970b5e3df0a9cff9c43d456f2 100644 (file)
--- a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.xml b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.xml
index 5cb9eee8db0946eb300c2bb96d37ef36c9d30001..aeddc7d4a07338bd902268882baa39c45e52273c 100644 (file)
--- a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.xml
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <smartcard mode='passthrough' type='tcp'>
       <source mode='bind' host='127.0.0.1' service='2001'/>
       <protocol type='raw'/>

diff --git a/tests/qemuxml2argvdata/smbios-date.xml b/tests/qemuxml2argvdata/smbios-date.xml
index 2e6cfde46bf0d5209f5e8846461a6c0ca34a03ac..06b2e9f7372a3c010634d4b76cbd91c30340c171 100644 (file)
--- a/tests/qemuxml2argvdata/smbios-date.xml
+++ b/tests/qemuxml2argvdata/smbios-date.xml
@@ -18,6 +18,6 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
   </devices>
 </domain>

diff --git a/tests/qemuxml2argvdata/smbios-multiple-type2.xml b/tests/qemuxml2argvdata/smbios-multiple-type2.xml
index ec24577d6c23fa6052dbf180afdeb627b7836549..9e79ff21be05902650d87a948ddf5daa538b37b2 100644 (file)
--- a/tests/qemuxml2argvdata/smbios-multiple-type2.xml
+++ b/tests/qemuxml2argvdata/smbios-multiple-type2.xml
@@ -44,7 +44,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/smbios-uuid-match.xml b/tests/qemuxml2argvdata/smbios-uuid-match.xml
index a8912266689812b7ebd433d300dc1bebbe45a529..e424a109e50285c9e22a03461b0de4328d56a99c 100644 (file)
--- a/tests/qemuxml2argvdata/smbios-uuid-match.xml
+++ b/tests/qemuxml2argvdata/smbios-uuid-match.xml
@@ -18,6 +18,6 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
   </devices>
 </domain>

diff --git a/tests/qemuxml2argvdata/smbios.args b/tests/qemuxml2argvdata/smbios.args
index 3ece80356194357b1bb74352b88188a9b5bf22a2..8ded1cb085dfda70bdf33777eade66f71799528f 100644 (file)
--- a/tests/qemuxml2argvdata/smbios.args
+++ b/tests/qemuxml2argvdata/smbios.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/smbios.xml b/tests/qemuxml2argvdata/smbios.xml
index ad8d13937536638b143949dc036c049e26c71bb0..9f67376449e9edd8f5b8b7d6d4003eeb78f968b3 100644 (file)
--- a/tests/qemuxml2argvdata/smbios.xml
+++ b/tests/qemuxml2argvdata/smbios.xml
@@ -49,7 +49,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/smp.args b/tests/qemuxml2argvdata/smp.args
index 21ee2572f27af15cd0b63a7ec41cda0bc09cfe2c..dbf714c9764700cd69592ccafafa73171c65c32f 100644 (file)
--- a/tests/qemuxml2argvdata/smp.args
+++ b/tests/qemuxml2argvdata/smp.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/smp.xml b/tests/qemuxml2argvdata/smp.xml
index 8ebe888a967ddd4b0d31f5a77b08d4b02a3d210f..55d5cdeff2f29521066be615cb5134f796604be6 100644 (file)
--- a/tests/qemuxml2argvdata/smp.xml
+++ b/tests/qemuxml2argvdata/smp.xml
@@ -16,7 +16,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/sound-device.args b/tests/qemuxml2argvdata/sound-device.args
index 4d70d5f3b0e49d44c80ad8d02c8758ebe1261ddf..ce159a705469e5ce03dba50a37daef2c49027a82 100644 (file)
--- a/tests/qemuxml2argvdata/sound-device.args
+++ b/tests/qemuxml2argvdata/sound-device.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/sound-device.xml b/tests/qemuxml2argvdata/sound-device.xml
index c544e9313e98c27051b69d0f78c9740322bc1300..b9427f880a52c6db48f2040da2ea46acb8c4fff7 100644 (file)
--- a/tests/qemuxml2argvdata/sound-device.xml
+++ b/tests/qemuxml2argvdata/sound-device.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/sound.args b/tests/qemuxml2argvdata/sound.args
index 1ab237dffaf4e2528a985bf60e8c74b22f61e3c8..7ed0c1e507f580bd245266353f576f0b3f16153d 100644 (file)
--- a/tests/qemuxml2argvdata/sound.args
+++ b/tests/qemuxml2argvdata/sound.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/sound.xml b/tests/qemuxml2argvdata/sound.xml
index b8b198d043e852a7c706fe29a318b6e95c8a2987..dd45361a6957a7cba07b5a90b387aba06abb04ef 100644 (file)
--- a/tests/qemuxml2argvdata/sound.xml
+++ b/tests/qemuxml2argvdata/sound.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/usb-bus-missing.xml b/tests/qemuxml2argvdata/usb-bus-missing.xml
index 831a4c0afb8bc301cddcd1ed6665549d86287cb2..23bfdc4c8fa79785fc42a65866a47ec36cca71d6 100644 (file)
--- a/tests/qemuxml2argvdata/usb-bus-missing.xml
+++ b/tests/qemuxml2argvdata/usb-bus-missing.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <memballoon model='virtio'/>
     <input type='mouse' bus='usb'>

diff --git a/tests/qemuxml2argvdata/usb-controller-xhci-limit.xml b/tests/qemuxml2argvdata/usb-controller-xhci-limit.xml
index 951ab5b35ccd1990e05e1ff764632d39384a87b5..1515afea7839c259b4b846d8cc49f74415e81604 100644 (file)
--- a/tests/qemuxml2argvdata/usb-controller-xhci-limit.xml
+++ b/tests/qemuxml2argvdata/usb-controller-xhci-limit.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0' model='nec-xhci' ports='16'/>
     <memballoon model='none'/>
   </devices>

diff --git a/tests/qemuxml2argvdata/usb-controller-xhci.args b/tests/qemuxml2argvdata/usb-controller-xhci.args
index a8c461b99e7638afb5d63c85a44a6636f3049d15..a23d0c47104e7b469cf321accd5288001069ad9d 100644 (file)
--- a/tests/qemuxml2argvdata/usb-controller-xhci.args
+++ b/tests/qemuxml2argvdata/usb-controller-xhci.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/usb-controller-xhci.xml b/tests/qemuxml2argvdata/usb-controller-xhci.xml
index b2e8beac14a8241a51dc5246e1014dde89892f4d..2988b1805156348716af68c15f22a59ce30f70bd 100644 (file)
--- a/tests/qemuxml2argvdata/usb-controller-xhci.xml
+++ b/tests/qemuxml2argvdata/usb-controller-xhci.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0' model='nec-xhci' ports='8'/>
     <memballoon model='none'/>
   </devices>

diff --git a/tests/qemuxml2argvdata/usb-controller.args b/tests/qemuxml2argvdata/usb-controller.args
index b3745dd1e875cc31b0dc34eec5e4f9055e1f02bc..4aa1388409f40798552d88b209abb4414ed77e13 100644 (file)
--- a/tests/qemuxml2argvdata/usb-controller.args
+++ b/tests/qemuxml2argvdata/usb-controller.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/usb-controller.xml b/tests/qemuxml2argvdata/usb-controller.xml
index af9e9dc201b17f06959cbc460636daff822d08de..7757a0719c49436ce46f85efe9a7041415ce8114 100644 (file)
--- a/tests/qemuxml2argvdata/usb-controller.xml
+++ b/tests/qemuxml2argvdata/usb-controller.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
index e65f5f6964dea3bd9c798eda6b9b7a644ab56bde..b944dcb78e3ea781f74f602591248139fd38a7e4 100644 (file)
--- a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
+++ b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.xml b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.xml
index ef3bec9190ee74a4156155ce0b3ab211e94e2c77..abf24709981cf9ece2441bb9cb48080fcb402e5c 100644 (file)
--- a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.xml
+++ b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <memballoon model='virtio'/>
     <input type='mouse' bus='usb'>

diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.args b/tests/qemuxml2argvdata/usb-hub-autoadd.args
index ad5a00c95085e802b4cfabb11b260e790ba74f31..fbfc88bedeab211915ce252179d42617fb805fe5 100644 (file)
--- a/tests/qemuxml2argvdata/usb-hub-autoadd.args
+++ b/tests/qemuxml2argvdata/usb-hub-autoadd.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.xml b/tests/qemuxml2argvdata/usb-hub-autoadd.xml
index b56287e7547f480578d5b9bd5892340c4e2f2a46..65dda5a40772be2a52b7d8497ff4ca2e8d92e9a2 100644 (file)
--- a/tests/qemuxml2argvdata/usb-hub-autoadd.xml
+++ b/tests/qemuxml2argvdata/usb-hub-autoadd.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <memballoon model='virtio'/>
     <input type='mouse' bus='usb'>

diff --git a/tests/qemuxml2argvdata/usb-hub-conflict.xml b/tests/qemuxml2argvdata/usb-hub-conflict.xml
index 222ae3df2a5e2199ca4794bfd65160c90109b48a..85ec3c4cf155926ee5906ff0f61f3a52dc103351 100644 (file)
--- a/tests/qemuxml2argvdata/usb-hub-conflict.xml
+++ b/tests/qemuxml2argvdata/usb-hub-conflict.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <memballoon model='virtio'/>
     <hub type='usb'>

diff --git a/tests/qemuxml2argvdata/usb-hub-nonexistent.xml b/tests/qemuxml2argvdata/usb-hub-nonexistent.xml
index 3da5916b1b1e105481452c5ba06a7dcef827c92f..7b2b17a6780779a5e33e9f64730abd73fa362fc2 100644 (file)
--- a/tests/qemuxml2argvdata/usb-hub-nonexistent.xml
+++ b/tests/qemuxml2argvdata/usb-hub-nonexistent.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <memballoon model='virtio'/>
     <input type='mouse' bus='usb'>

diff --git a/tests/qemuxml2argvdata/usb-hub.args b/tests/qemuxml2argvdata/usb-hub.args
index 121d39e5547d71953df5e23490e3e7d5e9b82e15..24b5217455031fe1420ac2e2a95c3f78b6958a5c 100644 (file)
--- a/tests/qemuxml2argvdata/usb-hub.args
+++ b/tests/qemuxml2argvdata/usb-hub.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/usb-hub.xml b/tests/qemuxml2argvdata/usb-hub.xml
index 9b2b85eabdb44488aaa5ce6fae9467bd6c6fbb65..e9e1fef964eb4a9dbc7e9325c66c26d30c7b3c8c 100644 (file)
--- a/tests/qemuxml2argvdata/usb-hub.xml
+++ b/tests/qemuxml2argvdata/usb-hub.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <memballoon model='virtio'/>
     <hub type='usb'>

diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.args b/tests/qemuxml2argvdata/usb-ich9-autoassign.args
index 2008ff188b96e04d213b6e126155786b5c66bdcf..dee4c843be774cf4bd688ac9445e90f1a1b9ab78 100644 (file)
--- a/tests/qemuxml2argvdata/usb-ich9-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-ich9-autoassign.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.xml b/tests/qemuxml2argvdata/usb-ich9-autoassign.xml
index c1e1a466643ef2161783c1e7c95ac478588dd6ac..309025582153bfdd3872e3c8fdc385523948d4a8 100644 (file)
--- a/tests/qemuxml2argvdata/usb-ich9-autoassign.xml
+++ b/tests/qemuxml2argvdata/usb-ich9-autoassign.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0' model='ich9-ehci1'>
       <address type='pci' domain='0' bus='0' slot='4' function='7'/>
     </controller>

diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.args b/tests/qemuxml2argvdata/usb-ich9-companion.args
index 1dba733d3629e7175c55246b6200511a0b5a14ed..b1f2478e722856fb5f35faa1494b83783b1528be 100644 (file)
--- a/tests/qemuxml2argvdata/usb-ich9-companion.args
+++ b/tests/qemuxml2argvdata/usb-ich9-companion.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.xml b/tests/qemuxml2argvdata/usb-ich9-companion.xml
index b9a8dd34ecb79085fd66064ed44f3a05f98cf328..7e31ec95d3ef2976030787a5a2d4c8aca4a25cb1 100644 (file)
--- a/tests/qemuxml2argvdata/usb-ich9-companion.xml
+++ b/tests/qemuxml2argvdata/usb-ich9-companion.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0' model='ich9-ehci1'>
       <address type='pci' domain='0' bus='0' slot='4' function='7'/>
     </controller>

diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
index 033b42f1f86b4f4bb2693da7fe7a00bf92ac66e7..a2c46c00f714858e95ddd0158e26d3192233fff9 100644 (file)
--- a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
+++ b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml
index ee34ba6a4ffa51ddc609e29603b387d1e1be4f5d..4da9fbdf0ea0e65b505361ad361b3e2ef8f58d2f 100644 (file)
--- a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml
+++ b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <!-- Intentionally mixed up ordering to check we assign
          addresses to the correct matching companions -->
     <controller type='usb' index='0' model='ich9-ehci1'>

diff --git a/tests/qemuxml2argvdata/usb-ich9-no-companion.xml b/tests/qemuxml2argvdata/usb-ich9-no-companion.xml
index 00c38a019a9893856599648508bd43518c39ff31..8c34954a1a298b4c582b110d9e25ccc409f85df8 100644 (file)
--- a/tests/qemuxml2argvdata/usb-ich9-no-companion.xml
+++ b/tests/qemuxml2argvdata/usb-ich9-no-companion.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0' model='ich9-uhci2'>
       <master startport='2'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0'/>

diff --git a/tests/qemuxml2argvdata/usb-long-port-path.args b/tests/qemuxml2argvdata/usb-long-port-path.args
index 60753a9b673e7b4e7c251537a8202deeb0b7b59d..caddab712dcfac046b9f2e838ee5c45feb04259a 100644 (file)
--- a/tests/qemuxml2argvdata/usb-long-port-path.args
+++ b/tests/qemuxml2argvdata/usb-long-port-path.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/usb-long-port-path.xml b/tests/qemuxml2argvdata/usb-long-port-path.xml
index 5f627485bbbbc146e7295b21793ff84495127e99..0df5c8408fd929491702089ede17a40a5a96cae8 100644 (file)
--- a/tests/qemuxml2argvdata/usb-long-port-path.xml
+++ b/tests/qemuxml2argvdata/usb-long-port-path.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2argvdata/usb-none-hub.xml b/tests/qemuxml2argvdata/usb-none-hub.xml
index 50f45f85fcf31361612031e5af4eb02ef599776b..7b6fd7d73762ad95c2a03927ed688d9b6a6f3bd2 100644 (file)
--- a/tests/qemuxml2argvdata/usb-none-hub.xml
+++ b/tests/qemuxml2argvdata/usb-none-hub.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' model='none' index='0'/>
     <memballoon model='virtio'/>
     <hub type='usb'>

diff --git a/tests/qemuxml2argvdata/usb-none-other.xml b/tests/qemuxml2argvdata/usb-none-other.xml
index 15891b3a9aa8b070efe8e285ceca32987b58bee8..f4e8a5e4de404de7cc16c243d3817bac3bf0a230 100644 (file)
--- a/tests/qemuxml2argvdata/usb-none-other.xml
+++ b/tests/qemuxml2argvdata/usb-none-other.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0' model='none'/>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>

diff --git a/tests/qemuxml2argvdata/usb-none-usbtablet.xml b/tests/qemuxml2argvdata/usb-none-usbtablet.xml
index c93b8cdd96039af3a1369f9d4c2859d117663856..36f33788dcf69ab27d6c814ad2e796f5102aeee7 100644 (file)
--- a/tests/qemuxml2argvdata/usb-none-usbtablet.xml
+++ b/tests/qemuxml2argvdata/usb-none-usbtablet.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' model='none' index='0'/>
     <input type='tablet' bus='usb'/>
     <memballoon model='virtio'/>

diff --git a/tests/qemuxml2argvdata/usb-none.args b/tests/qemuxml2argvdata/usb-none.args
index c0af8428c76980b914979b965825197ac268abcc..a3a01b7e7445b8e47c04b4d45a21f6d1479b6265 100644 (file)
--- a/tests/qemuxml2argvdata/usb-none.args
+++ b/tests/qemuxml2argvdata/usb-none.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/usb-none.xml b/tests/qemuxml2argvdata/usb-none.xml
index c3190550e9042a95314ba406a96af6df274e7aa0..9d429dd845b8e049fd589acb2b31fc4c532a81a2 100644 (file)
--- a/tests/qemuxml2argvdata/usb-none.xml
+++ b/tests/qemuxml2argvdata/usb-none.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0' model='none'/>
     <memballoon model='virtio'/>
   </devices>

diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.args b/tests/qemuxml2argvdata/usb-piix3-controller.args
index 8fed0891f0ada285051228ef9a2437c2fc063647..6000e89bbf08298d590a7f62e3917e6c76cc9302 100644 (file)
--- a/tests/qemuxml2argvdata/usb-piix3-controller.args
+++ b/tests/qemuxml2argvdata/usb-piix3-controller.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.xml b/tests/qemuxml2argvdata/usb-piix3-controller.xml
index 0df5c0335be36f4a0d735d6ed59ff2dfd0245e9e..eafc97f7feb4e874383718f36f0960ceef28db12 100644 (file)
--- a/tests/qemuxml2argvdata/usb-piix3-controller.xml
+++ b/tests/qemuxml2argvdata/usb-piix3-controller.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0' model='piix3-uhci'/>
     <memballoon model='virtio'/>
   </devices>

diff --git a/tests/qemuxml2argvdata/usb-port-autoassign.args b/tests/qemuxml2argvdata/usb-port-autoassign.args
index bf31faaf17fdf2127af238ca3d193018dec41da3..bd3c573a86256a5e205620b46b187670bd2aa1f3 100644 (file)
--- a/tests/qemuxml2argvdata/usb-port-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-port-autoassign.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/usb-port-autoassign.xml b/tests/qemuxml2argvdata/usb-port-autoassign.xml
index 7e220437c99419a8b1b7861638520ae27e02df85..72a69d85f38083e4ab882dbde38942af99cf7fb4 100644 (file)
--- a/tests/qemuxml2argvdata/usb-port-autoassign.xml
+++ b/tests/qemuxml2argvdata/usb-port-autoassign.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <memballoon model='virtio'/>
     <hub type='usb'>

diff --git a/tests/qemuxml2argvdata/usb-port-missing.args b/tests/qemuxml2argvdata/usb-port-missing.args
index d01071fc50f46cbd212141da7e3daa808a8cff58..480968883d469fd491bda1b7ad8f411b18df618e 100644 (file)
--- a/tests/qemuxml2argvdata/usb-port-missing.args
+++ b/tests/qemuxml2argvdata/usb-port-missing.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/usb-port-missing.xml b/tests/qemuxml2argvdata/usb-port-missing.xml
index ed33b17b95aa52692e3213d05f5a21e2a3bdeb4b..0d8906268fee7ec5bb6453956ac89b1fd5998ad8 100644 (file)
--- a/tests/qemuxml2argvdata/usb-port-missing.xml
+++ b/tests/qemuxml2argvdata/usb-port-missing.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <memballoon model='virtio'/>
     <input type='mouse' bus='usb'>

diff --git a/tests/qemuxml2argvdata/usb-ports-out-of-range.xml b/tests/qemuxml2argvdata/usb-ports-out-of-range.xml
index 17a1adfdcc40a6aa037a41c9cb2c885aa698ebaa..3dd746114f9e9cdff9a014e2db686e3490ec81d8 100644 (file)
--- a/tests/qemuxml2argvdata/usb-ports-out-of-range.xml
+++ b/tests/qemuxml2argvdata/usb-ports-out-of-range.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <memballoon model='virtio'/>
     <hub type='usb'>

diff --git a/tests/qemuxml2argvdata/usb-ports.args b/tests/qemuxml2argvdata/usb-ports.args
index 511242ac0459fba53c3faac68dd29d57562fcfa1..5f04bf088d412bc38169adcbe502f9efd832bd2f 100644 (file)
--- a/tests/qemuxml2argvdata/usb-ports.args
+++ b/tests/qemuxml2argvdata/usb-ports.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/usb-ports.xml b/tests/qemuxml2argvdata/usb-ports.xml
index 8cea0104f95b637e3292a06f9c0fdb9020649835..9eaf210368ece209bb4c09349cb53cb0831e0031 100644 (file)
--- a/tests/qemuxml2argvdata/usb-ports.xml
+++ b/tests/qemuxml2argvdata/usb-ports.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <memballoon model='virtio'/>
     <hub type='usb'>

diff --git a/tests/qemuxml2argvdata/usb-redir-boot.args b/tests/qemuxml2argvdata/usb-redir-boot.args
index 84b716a420d8877f8d0d5e268aedebce521e5736..9f6b49310d179a0eb1c5c2527217cf2ef188559a 100644 (file)
--- a/tests/qemuxml2argvdata/usb-redir-boot.args
+++ b/tests/qemuxml2argvdata/usb-redir-boot.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/usb-redir-boot.xml b/tests/qemuxml2argvdata/usb-redir-boot.xml
index 8f299d2ad459089f74dc3526463af5c95b76a87a..9fbcaa2256e1342efe7b4b64d36cc1ed8cb00a62 100644 (file)
--- a/tests/qemuxml2argvdata/usb-redir-boot.xml
+++ b/tests/qemuxml2argvdata/usb-redir-boot.xml
@@ -12,7 +12,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0' model='ich9-ehci1'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x7'/>
     </controller>

diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.args b/tests/qemuxml2argvdata/usb-redir-filter-version.args
index 569d736b5a86a98cca2c52cb97e1177187a43ae4..89dcbfaaa1400feb4cd230cdb69185a3499515d2 100644 (file)
--- a/tests/qemuxml2argvdata/usb-redir-filter-version.args
+++ b/tests/qemuxml2argvdata/usb-redir-filter-version.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.xml b/tests/qemuxml2argvdata/usb-redir-filter-version.xml
index d51def34dc84ba18f3cb8ae643f0f89d82c9853d..2e45517c2f57bc44768e3f759538b26c87fc8cfc 100644 (file)
--- a/tests/qemuxml2argvdata/usb-redir-filter-version.xml
+++ b/tests/qemuxml2argvdata/usb-redir-filter-version.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <redirdev bus='usb' type='spicevmc'>

diff --git a/tests/qemuxml2argvdata/usb-redir-filter.args b/tests/qemuxml2argvdata/usb-redir-filter.args
index 337ba0208a77b32c9081abae8e4d19e5c17c8d70..d801505f9819d3ed98d8100658cd4feb778d2194 100644 (file)
--- a/tests/qemuxml2argvdata/usb-redir-filter.args
+++ b/tests/qemuxml2argvdata/usb-redir-filter.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/usb-redir-filter.xml b/tests/qemuxml2argvdata/usb-redir-filter.xml
index 0bc15f0df19b9d411f85c08c650122fa65853874..791725efb3561f74f42c4437a96e15ddfa3038c4 100644 (file)
--- a/tests/qemuxml2argvdata/usb-redir-filter.xml
+++ b/tests/qemuxml2argvdata/usb-redir-filter.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0' model='ich9-ehci1'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x7'/>
     </controller>

diff --git a/tests/qemuxml2argvdata/usb-redir.args b/tests/qemuxml2argvdata/usb-redir.args
index 479a880e9bb1d05dac632fd7e91ea731c06fb369..d4f1e0dd0e4390b7a022eba674ad2ab57b3b6fdd 100644 (file)
--- a/tests/qemuxml2argvdata/usb-redir.args
+++ b/tests/qemuxml2argvdata/usb-redir.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/usb-redir.xml b/tests/qemuxml2argvdata/usb-redir.xml
index 67624b657c8d50798b15f4f6da5571f49a505b2f..b2c805dba8c7869be8f309b25f548bc442041804 100644 (file)
--- a/tests/qemuxml2argvdata/usb-redir.xml
+++ b/tests/qemuxml2argvdata/usb-redir.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0' model='ich9-ehci1'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x7'/>
     </controller>

diff --git a/tests/qemuxml2argvdata/usb-too-long-port-path-invalid.xml b/tests/qemuxml2argvdata/usb-too-long-port-path-invalid.xml
index 383607ebf50c7aacf16daf55a60bcd6e92e6639c..33c781a79182fb26190022227dc6c0f1dc116660 100644 (file)
--- a/tests/qemuxml2argvdata/usb-too-long-port-path-invalid.xml
+++ b/tests/qemuxml2argvdata/usb-too-long-port-path-invalid.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2argvdata/usb-xhci-autoassign.args b/tests/qemuxml2argvdata/usb-xhci-autoassign.args
index 82e4dcdf7a032934188e99c1d101f3720e01019a..d68ff5f90f4d22273c3c109d428763ee9f45e4ab 100644 (file)
--- a/tests/qemuxml2argvdata/usb-xhci-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-xhci-autoassign.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/usb-xhci-autoassign.xml b/tests/qemuxml2argvdata/usb-xhci-autoassign.xml
index fce3c18819c623f8775a218c439a3d5e7d2a6479..55a40c4414eeded9c8e4fef059cbcace86c97440 100644 (file)
--- a/tests/qemuxml2argvdata/usb-xhci-autoassign.xml
+++ b/tests/qemuxml2argvdata/usb-xhci-autoassign.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0' model='nec-xhci' ports='8'/>
     <hub type='usb'/>
     <input type='mouse' bus='usb'>

diff --git a/tests/qemuxml2argvdata/usb1-usb2.args b/tests/qemuxml2argvdata/usb1-usb2.args
index e6308a1078189c50ae33eeba589e728be03e82b7..9098cc6d9aa49ed57214c5c9edd29c0ff7a5d580 100644 (file)
--- a/tests/qemuxml2argvdata/usb1-usb2.args
+++ b/tests/qemuxml2argvdata/usb1-usb2.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/usb1-usb2.xml b/tests/qemuxml2argvdata/usb1-usb2.xml
index 9ff2478d53cd1ccdac903fbba14252b8d08b5def..ed4622b03bd708282204f8ccb346120c4dd62da8 100644 (file)
--- a/tests/qemuxml2argvdata/usb1-usb2.xml
+++ b/tests/qemuxml2argvdata/usb1-usb2.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <memballoon model='virtio'/>
 
     <controller type='usb' index='0' model='piix3-uhci'>

diff --git a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args
index 46c53c45fa56e6c75e84a1fd95d73a244b1c400f..1f42fdce192978a40f3e980b026f842610a8faaf 100644 (file)
--- a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.xml b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.xml
index bb1f345532686df169161da64751e3646371304c..f59bd7364c443191c819c25a0f72b0f988e4522d 100644 (file)
--- a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.xml
+++ b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.xml
@@ -22,7 +22,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args b/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args
index 0b67b34797f9c47a17529ceffdd454d8810d2d3a..b8f6d1243cd40e550c25e2dfb082ba0fb51b18ae 100644 (file)
--- a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/vhost-user-vga.xml b/tests/qemuxml2argvdata/vhost-user-vga.xml
index baa0242725ab364bcd1ed6dd8512d6054d8e9b19..f5cf35d0ec0fc4466dc2b88ad2412bed354c99db 100644 (file)
--- a/tests/qemuxml2argvdata/vhost-user-vga.xml
+++ b/tests/qemuxml2argvdata/vhost-user-vga.xml
@@ -22,7 +22,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args b/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args
index 2112c105764d5f52298bd50352dea002d11c8e33..4d1f81f9333b475565b10dba646482952234c30f 100644 (file)
--- a/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/video-bochs-display-device.xml b/tests/qemuxml2argvdata/video-bochs-display-device.xml
index 3c59bf7c6a7e07c037a855086899028d01c00e02..bf789566e409def8b5bc806d9d5985f06ee6e7ec 100644 (file)
--- a/tests/qemuxml2argvdata/video-bochs-display-device.xml
+++ b/tests/qemuxml2argvdata/video-bochs-display-device.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='none'/>
       <source file='/var/lib/libvirt/images/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/video-invalid-multiple-devices.xml b/tests/qemuxml2argvdata/video-invalid-multiple-devices.xml
index 3f105efaaeafda57a7d3e8137e46cfa9794b4e3c..606c60dcea5ec1c4d23063b5e49f90d58eb51494 100644 (file)
--- a/tests/qemuxml2argvdata/video-invalid-multiple-devices.xml
+++ b/tests/qemuxml2argvdata/video-invalid-multiple-devices.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/video-invalid.xml b/tests/qemuxml2argvdata/video-invalid.xml
index 68ae12a418e66a98b0df9607de5ad861ecebbf0b..9f24b7a096abf697ef8ba6b589bb94fdf7a1a193 100644 (file)
--- a/tests/qemuxml2argvdata/video-invalid.xml
+++ b/tests/qemuxml2argvdata/video-invalid.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/video-none-device.args b/tests/qemuxml2argvdata/video-none-device.args
index 0fe0b2abff4371a7d18f12a5568c6efbe36c9628..193ff21414c59b3dda598e2afb090d0aca8bb6af 100644 (file)
--- a/tests/qemuxml2argvdata/video-none-device.args
+++ b/tests/qemuxml2argvdata/video-none-device.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/video-none-device.xml b/tests/qemuxml2argvdata/video-none-device.xml
index c1c60c1d9ea6fd09ad211da44ff9da104d4a51e6..a7d4d7d3c4fd92b627dba69a5d8f06c3ac19257b 100644 (file)
--- a/tests/qemuxml2argvdata/video-none-device.xml
+++ b/tests/qemuxml2argvdata/video-none-device.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
index e977437d76e29ae804fa3c2d3de50a04828cce7e..aef42cc1c8f27aea65b57a9ecb54963e0c620b87 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/video-qxl-device-vgamem.xml b/tests/qemuxml2argvdata/video-qxl-device-vgamem.xml
index ee8e2e68933fe0379942ff1170e6b56500101891..d52fdf0fa0b29351fcea7010fe239adae4955b23 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-device-vgamem.xml
+++ b/tests/qemuxml2argvdata/video-qxl-device-vgamem.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='none'/>
       <source file='/var/lib/libvirt/images/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/video-qxl-device.args b/tests/qemuxml2argvdata/video-qxl-device.args
index f4877c63a983ffc7c89e242e1c9658903d773899..575a6d4cfd1a14406e9a8e757a870cc52b22d5e2 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-device.args
+++ b/tests/qemuxml2argvdata/video-qxl-device.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/video-qxl-device.xml b/tests/qemuxml2argvdata/video-qxl-device.xml
index ee8e2e68933fe0379942ff1170e6b56500101891..d52fdf0fa0b29351fcea7010fe239adae4955b23 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-device.xml
+++ b/tests/qemuxml2argvdata/video-qxl-device.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='none'/>
       <source file='/var/lib/libvirt/images/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/video-qxl-heads.args b/tests/qemuxml2argvdata/video-qxl-heads.args
index f8df91e556d6b0fe8cb52aa253e375634c837dce..74cab50ba506b65a2a1aacacc135b3e67af71fcd 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-heads.args
+++ b/tests/qemuxml2argvdata/video-qxl-heads.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/video-qxl-heads.xml b/tests/qemuxml2argvdata/video-qxl-heads.xml
index d878ddcd6d2ec774e00c2b242a31606b2e95c637..9601d671fb7ebb8af56b33fcf0a3cd434347fc2b 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-heads.xml
+++ b/tests/qemuxml2argvdata/video-qxl-heads.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/video-qxl-nodevice.args b/tests/qemuxml2argvdata/video-qxl-nodevice.args
index 7a21464d58ff3e298a461167da3aa45cf92c5e99..830b5f9c3ea13e05f38012ac2f13e41e3a3531c6 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-nodevice.args
+++ b/tests/qemuxml2argvdata/video-qxl-nodevice.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/video-qxl-nodevice.xml b/tests/qemuxml2argvdata/video-qxl-nodevice.xml
index ee8e2e68933fe0379942ff1170e6b56500101891..d52fdf0fa0b29351fcea7010fe239adae4955b23 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-nodevice.xml
+++ b/tests/qemuxml2argvdata/video-qxl-nodevice.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='none'/>
       <source file='/var/lib/libvirt/images/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/video-qxl-noheads.args b/tests/qemuxml2argvdata/video-qxl-noheads.args
index fea9f14b29d6dabb3c534c148fa86249704c2c11..8c38697fe77fb8a682daee567e86759e02fb8fd2 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-noheads.args
+++ b/tests/qemuxml2argvdata/video-qxl-noheads.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/video-qxl-noheads.xml b/tests/qemuxml2argvdata/video-qxl-noheads.xml
index c20d267b9c924a26ecc5fcf2b1ea2ec8f19af22e..f29d1284cd6b7fb2d818f0e3efed297caf6e8b5c 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-noheads.xml
+++ b/tests/qemuxml2argvdata/video-qxl-noheads.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/video-qxl-resolution.args b/tests/qemuxml2argvdata/video-qxl-resolution.args
index ed2e4422dabd20768db4a82942b71c2434b7b8b0..1fdaf7e02e852901ab04e325f3cd61a398ce4304 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-resolution.args
+++ b/tests/qemuxml2argvdata/video-qxl-resolution.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/video-qxl-resolution.xml b/tests/qemuxml2argvdata/video-qxl-resolution.xml
index 1bc415f3f864f2e6fc7f9f604aad47af7a001471..e693cbce473dde4943f8f4ff5c4a44ebf34adff9 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-resolution.xml
+++ b/tests/qemuxml2argvdata/video-qxl-resolution.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
index 7e11b75ebf96384c0904cf844949389efea551c0..3c47329c8d55894e78cbc81569232b4555623f5f 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.xml b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.xml
index c736735a4a89a63d7099fe7d4661b2f75d96c667..5b9427afd8a19aba8da48509a88d1511a5b56a08 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.xml
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='none'/>
       <source file='/var/lib/libvirt/images/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args
index d814b1167454eeff2d7f21056696a0f95513cca2..486e5b70af92de83730205505ca189f91b90ae14 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.xml b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.xml
index 6bd0909c5924eedc094dc06b2de6f577aea76346..50ac972e1a1404c523e968a85af6517496afaf9d 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.xml
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='ide' index='0'/>
     <video>
       <model type='qxl' heads='1'/>

diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device.args b/tests/qemuxml2argvdata/video-qxl-sec-device.args
index 73f96ecf77ceacafd3e8a615c73f5599f050a36d..6fb728658ad515c900efc377ff5d5dcc69c04a5c 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-sec-device.args
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device.xml b/tests/qemuxml2argvdata/video-qxl-sec-device.xml
index c736735a4a89a63d7099fe7d4661b2f75d96c667..5b9427afd8a19aba8da48509a88d1511a5b56a08 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-sec-device.xml
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='none'/>
       <source file='/var/lib/libvirt/images/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args b/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args
index 98983a1e2616adaa43cc307b3b79c133eef3ac4e..707061269e3c207691c57d4c1c19ddd2aff6f30f 100644 (file)
--- a/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,\

diff --git a/tests/qemuxml2argvdata/video-ramfb-display-device.xml b/tests/qemuxml2argvdata/video-ramfb-display-device.xml
index 4123dad3721772c1b063f91b59cd9c574d519b28..ad1c35e491242be98706932a2fe3131689b12933 100644 (file)
--- a/tests/qemuxml2argvdata/video-ramfb-display-device.xml
+++ b/tests/qemuxml2argvdata/video-ramfb-display-device.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='none'/>
       <source file='/var/lib/libvirt/images/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/video-vga-device-vgamem.args b/tests/qemuxml2argvdata/video-vga-device-vgamem.args
index 8fdf4fb8be3ee9fa12bec340fd515e72f15ead78..c267f4bf676bbfa4bfa4bc3f5d5f2357251164fe 100644 (file)
--- a/tests/qemuxml2argvdata/video-vga-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-vga-device-vgamem.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/video-vga-device-vgamem.xml b/tests/qemuxml2argvdata/video-vga-device-vgamem.xml
index 21b4119ce78574043d7a8c40d09ad3aeb924eab1..7e2080af0d6f4ddd3b9177020d62303aaed79d75 100644 (file)
--- a/tests/qemuxml2argvdata/video-vga-device-vgamem.xml
+++ b/tests/qemuxml2argvdata/video-vga-device-vgamem.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='none'/>
       <source file='/var/lib/libvirt/images/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/video-vga-device.args b/tests/qemuxml2argvdata/video-vga-device.args
index 259d6c8732ed5fb0c60b4e6d3e662ff0fa020abd..132d67ed89e8c6d1e4295f716bb0a2e84e39cc03 100644 (file)
--- a/tests/qemuxml2argvdata/video-vga-device.args
+++ b/tests/qemuxml2argvdata/video-vga-device.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/video-vga-device.xml b/tests/qemuxml2argvdata/video-vga-device.xml
index 21b4119ce78574043d7a8c40d09ad3aeb924eab1..7e2080af0d6f4ddd3b9177020d62303aaed79d75 100644 (file)
--- a/tests/qemuxml2argvdata/video-vga-device.xml
+++ b/tests/qemuxml2argvdata/video-vga-device.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='none'/>
       <source file='/var/lib/libvirt/images/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/video-vga-nodevice.args b/tests/qemuxml2argvdata/video-vga-nodevice.args
index 5498963335e40bac7ddd6acc937b71cd8a0e9950..cf21cafcef17b712c3ee88fb0485b43482719fe2 100644 (file)
--- a/tests/qemuxml2argvdata/video-vga-nodevice.args
+++ b/tests/qemuxml2argvdata/video-vga-nodevice.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/video-vga-nodevice.xml b/tests/qemuxml2argvdata/video-vga-nodevice.xml
index 21b4119ce78574043d7a8c40d09ad3aeb924eab1..7e2080af0d6f4ddd3b9177020d62303aaed79d75 100644 (file)
--- a/tests/qemuxml2argvdata/video-vga-nodevice.xml
+++ b/tests/qemuxml2argvdata/video-vga-nodevice.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='none'/>
       <source file='/var/lib/libvirt/images/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/video-vga-qxl-heads.args b/tests/qemuxml2argvdata/video-vga-qxl-heads.args
index eb53f091c5510d41303db46fa6fe5724c7964e47..154bc1c2b7529ddf60ed9f00e329882868d30c2a 100644 (file)
--- a/tests/qemuxml2argvdata/video-vga-qxl-heads.args
+++ b/tests/qemuxml2argvdata/video-vga-qxl-heads.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/video-vga-qxl-heads.xml b/tests/qemuxml2argvdata/video-vga-qxl-heads.xml
index d878ddcd6d2ec774e00c2b242a31606b2e95c637..9601d671fb7ebb8af56b33fcf0a3cd434347fc2b 100644 (file)
--- a/tests/qemuxml2argvdata/video-vga-qxl-heads.xml
+++ b/tests/qemuxml2argvdata/video-vga-qxl-heads.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-device.args b/tests/qemuxml2argvdata/video-virtio-gpu-device.args
index 4f1d917b13aadbf55c04903565fcfe8a7874e505..050d989bad5f18ace03351bb34b9631566ffcf33 100644 (file)
--- a/tests/qemuxml2argvdata/video-virtio-gpu-device.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-device.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-device.xml b/tests/qemuxml2argvdata/video-virtio-gpu-device.xml
index e7af3192c99a68897fab2884a03bdd61b6f0ac31..a9354d77a2219754c62695c453efdb755bc51e14 100644 (file)
--- a/tests/qemuxml2argvdata/video-virtio-gpu-device.xml
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-device.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='none'/>
       <source file='/var/lib/libvirt/images/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
index 64d52e8052b957e6a7c0aa55bcd3ef08e0aba142..7a5df4054690ee256f956f7a90d20d59f3136059 100644 (file)
--- a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
@@ -6,7 +6,7 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.xml b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.xml
index 9dea73fbe4b05d3332991ef919ab47ec6dcd2637..9c46bfb4eb13171cad0e9e9f2ed29e241c5b9411 100644 (file)
--- a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.xml
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='none'/>
       <source file='/var/lib/libvirt/images/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
index 3acd363a9a0664824a20ca7e9ca8874a00c5829b..8852351ef031699ccd98c5055cc458ae5b20c522 100644 (file)
--- a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=spice \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.xml b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.xml
index 3aeb3e1f55c10ed7aba42ed8427bdf1d96481360..2c084224dd25da260c1ab4965514c27b5708f79f 100644 (file)
--- a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.xml
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='none'/>
       <source file='/var/lib/libvirt/images/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
index a73a7523922ef575bf45880e5109f01346e7efbc..42760eba6076c7a2f1db636904ff94fb13c89798 100644 (file)
--- a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.xml b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.xml
index 305657c5533e1fea51975fc8eb4f12b22ce32c04..97da27deedabd7725f36a5efba373e07fcdcb938 100644 (file)
--- a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.xml
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='none'/>
       <source file='/var/lib/libvirt/images/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/video-virtio-vga.args b/tests/qemuxml2argvdata/video-virtio-vga.args
index 48a1822f7942185ba404b1a625882d7596bb10cc..cb87552342f15670b049bedb6429526d17289197 100644 (file)
--- a/tests/qemuxml2argvdata/video-virtio-vga.args
+++ b/tests/qemuxml2argvdata/video-virtio-vga.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/video-virtio-vga.xml b/tests/qemuxml2argvdata/video-virtio-vga.xml
index e7af3192c99a68897fab2884a03bdd61b6f0ac31..a9354d77a2219754c62695c453efdb755bc51e14 100644 (file)
--- a/tests/qemuxml2argvdata/video-virtio-vga.xml
+++ b/tests/qemuxml2argvdata/video-virtio-vga.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='none'/>
       <source file='/var/lib/libvirt/images/QEMUGuest1'/>

diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.args b/tests/qemuxml2argvdata/virtio-input-passthrough.args
index 46dce511db949ebfd7e218424befa0504c5b12b9..d26952c1816a5f456c9446533301f9b6fbffe5dc 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-input-passthrough.args
+++ b/tests/qemuxml2argvdata/virtio-input-passthrough.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.xml b/tests/qemuxml2argvdata/virtio-input-passthrough.xml
index 00881a0530b181178b15df15e43921647524b61c..da20214f18e22f7fe926aeed183f4a4e1ec5d68c 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-input-passthrough.xml
+++ b/tests/qemuxml2argvdata/virtio-input-passthrough.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='passthrough' bus='virtio'>

diff --git a/tests/qemuxml2argvdata/virtio-input.args b/tests/qemuxml2argvdata/virtio-input.args
index 30141cc2df2098d800aec97c890f31b60bdd4b0f..c89997af6b02f05c4bd70782b436cf0c62720571 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-input.args
+++ b/tests/qemuxml2argvdata/virtio-input.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/virtio-input.xml b/tests/qemuxml2argvdata/virtio-input.xml
index 0f69cfb076c79fa98785bf17cae419667ce25cb8..a464639eb6ee4f1b4e8c25988dd581e1091e1015 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-input.xml
+++ b/tests/qemuxml2argvdata/virtio-input.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='virtio'/>

diff --git a/tests/qemuxml2argvdata/virtio-rng-default.args b/tests/qemuxml2argvdata/virtio-rng-default.args
index ea46104ee1a433ab80c9b3fa9a266d3c60019417..c21e0176e2879b47ce7afe738e9a837c0ab10878 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-rng-default.args
+++ b/tests/qemuxml2argvdata/virtio-rng-default.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/virtio-rng-default.xml b/tests/qemuxml2argvdata/virtio-rng-default.xml
index a91e6fbd04ba90ca1e2e384528473fc9d9400433..b3e3dbfe397e5d7207572c1fd7cdd20342303fd7 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-rng-default.xml
+++ b/tests/qemuxml2argvdata/virtio-rng-default.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <memballoon model='virtio'/>
     <rng model='virtio'>

diff --git a/tests/qemuxml2argvdata/virtio-rng-egd-crash.xml b/tests/qemuxml2argvdata/virtio-rng-egd-crash.xml
index 2573f005a31286556fb0c5813b2cb134d188722e..fea626639a17c67e7baa58c7bc1bb15f3341c089 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-rng-egd-crash.xml
+++ b/tests/qemuxml2argvdata/virtio-rng-egd-crash.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <memballoon model='virtio'/>

diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.args b/tests/qemuxml2argvdata/virtio-rng-egd.args
index ad58f40e2864cd7094d32ef1ea6aba285463f221..b07549c4ece534cb40eac26f9bb3c4f9dd88afe0 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-rng-egd.args
+++ b/tests/qemuxml2argvdata/virtio-rng-egd.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.xml b/tests/qemuxml2argvdata/virtio-rng-egd.xml
index b3d91df324f90888ea37e5e57c58c63745806839..8e446f2bf9cffe6a9d2d414580b86f8cd1d14054 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-rng-egd.xml
+++ b/tests/qemuxml2argvdata/virtio-rng-egd.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>

diff --git a/tests/qemuxml2argvdata/virtio-rng-multiple.args b/tests/qemuxml2argvdata/virtio-rng-multiple.args
index 881cdf0bce08f330a9058bf4ba500286518a5f4c..c70eba02ed0e330c33df4b55dffc7ba153e3e3f5 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-rng-multiple.args
+++ b/tests/qemuxml2argvdata/virtio-rng-multiple.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/virtio-rng-multiple.xml b/tests/qemuxml2argvdata/virtio-rng-multiple.xml
index 63e02d86ad0eb780846f643ae8fd81d28eb6262f..3c0e2a74636910f62e52e6c806bd0609533bc16c 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-rng-multiple.xml
+++ b/tests/qemuxml2argvdata/virtio-rng-multiple.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <memballoon model='virtio'/>

diff --git a/tests/qemuxml2argvdata/virtio-rng-random.args b/tests/qemuxml2argvdata/virtio-rng-random.args
index 2ab2f2300d066fa239647d7d74b3537182efbb5b..dbe014849dfbe0684515f1cf1d70a8565b815d5d 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-rng-random.args
+++ b/tests/qemuxml2argvdata/virtio-rng-random.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/virtio-rng-random.xml b/tests/qemuxml2argvdata/virtio-rng-random.xml
index a71af148fb52c3bede0d1e77de77637879c4c80b..738ab13d23f7457ea5498baceca4ac8fa0ab817f 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-rng-random.xml
+++ b/tests/qemuxml2argvdata/virtio-rng-random.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>

diff --git a/tests/qemuxml2argvdata/vmcoreinfo.args b/tests/qemuxml2argvdata/vmcoreinfo.args
index 50684be6adf4c4d1b118e4087f4f3bf806f92e25..e4b1bbeb5fa4a52f8190ea3a9f1b0d34c407f4bf 100644 (file)
--- a/tests/qemuxml2argvdata/vmcoreinfo.args
+++ b/tests/qemuxml2argvdata/vmcoreinfo.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/vmcoreinfo.xml b/tests/qemuxml2argvdata/vmcoreinfo.xml
index f8e58653107e62d964e97b59515bfe5546e7842b..f00109c5fdf27b2dee4b4ce353536832a4e70036 100644 (file)
--- a/tests/qemuxml2argvdata/vmcoreinfo.xml
+++ b/tests/qemuxml2argvdata/vmcoreinfo.xml
@@ -16,7 +16,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/watchdog-device.args b/tests/qemuxml2argvdata/watchdog-device.args
index 074c38d8a462f123ba590568b2879cb5fa3db91c..5e5e33db7af38eee87bc1152a92183088396287e 100644 (file)
--- a/tests/qemuxml2argvdata/watchdog-device.args
+++ b/tests/qemuxml2argvdata/watchdog-device.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/watchdog-device.xml b/tests/qemuxml2argvdata/watchdog-device.xml
index b2c5f670f636a5299e16c9f676f40f5ec2fd541d..a65caf5be430db5435996b83bae8338349deef25 100644 (file)
--- a/tests/qemuxml2argvdata/watchdog-device.xml
+++ b/tests/qemuxml2argvdata/watchdog-device.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/watchdog-dump.args b/tests/qemuxml2argvdata/watchdog-dump.args
index 0d440926076da29fe94368646ce99817df983896..9d69a49c734d4d5c373b3d6e063c0c36f358f30c 100644 (file)
--- a/tests/qemuxml2argvdata/watchdog-dump.args
+++ b/tests/qemuxml2argvdata/watchdog-dump.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/watchdog-dump.xml b/tests/qemuxml2argvdata/watchdog-dump.xml
index cdc48edb0c1d36f154c7d3be638e196181a44aff..f2d3db778873bd237d2df313d419c87dde12fde0 100644 (file)
--- a/tests/qemuxml2argvdata/watchdog-dump.xml
+++ b/tests/qemuxml2argvdata/watchdog-dump.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/watchdog-injectnmi.args b/tests/qemuxml2argvdata/watchdog-injectnmi.args
index ea59463c0459470e0d2d858b0397be00f94950c2..9109a713e0b8a53ff4e355e3b09319d3b0cd15ad 100644 (file)
--- a/tests/qemuxml2argvdata/watchdog-injectnmi.args
+++ b/tests/qemuxml2argvdata/watchdog-injectnmi.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/watchdog-injectnmi.xml b/tests/qemuxml2argvdata/watchdog-injectnmi.xml
index 0d8f2ac50ee0d1cef734ba3f2d91e0b4199e869a..ea33be583bc92ccea039974c908fd8871284f7d7 100644 (file)
--- a/tests/qemuxml2argvdata/watchdog-injectnmi.xml
+++ b/tests/qemuxml2argvdata/watchdog-injectnmi.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>

diff --git a/tests/qemuxml2argvdata/watchdog.args b/tests/qemuxml2argvdata/watchdog.args
index 8775d7f3c667ead87ca0a3587d63f6c2a705a2c1..bfd901929c1794383117ba7881798838c3393928 100644 (file)
--- a/tests/qemuxml2argvdata/watchdog.args
+++ b/tests/qemuxml2argvdata/watchdog.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

diff --git a/tests/qemuxml2argvdata/watchdog.xml b/tests/qemuxml2argvdata/watchdog.xml
index 4557a774cdb7fe460558f15294be7b357fcba34d..afeccbc58b89ffab066974c500f13d97a156125d 100644 (file)
--- a/tests/qemuxml2argvdata/watchdog.xml
+++ b/tests/qemuxml2argvdata/watchdog.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/balloon-device-auto.xml b/tests/qemuxml2xmloutdata/balloon-device-auto.xml
index cc92b7823f6305a326a76096c1b652a3c280b544..974f94ed20168ac0d49c55a340feb4ed76abf4d7 100644 (file)
--- a/tests/qemuxml2xmloutdata/balloon-device-auto.xml
+++ b/tests/qemuxml2xmloutdata/balloon-device-auto.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/balloon-device-period.xml b/tests/qemuxml2xmloutdata/balloon-device-period.xml
index 45c7a22f39ee7a3739d0aec202d413743ac8acd7..bebb93071fb569b74dbda483fc9e85b81c65ebaa 100644 (file)
--- a/tests/qemuxml2xmloutdata/balloon-device-period.xml
+++ b/tests/qemuxml2xmloutdata/balloon-device-period.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/blkdeviotune.xml b/tests/qemuxml2xmloutdata/blkdeviotune.xml
index 25154b6bf42d9830492b41307639679317e915ad..ed8c8809db9465532e5a266a2e9fa458aa2daf0a 100644 (file)
--- a/tests/qemuxml2xmloutdata/blkdeviotune.xml
+++ b/tests/qemuxml2xmloutdata/blkdeviotune.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='qcow2' cache='none'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/blkiotune-device.xml b/tests/qemuxml2xmloutdata/blkiotune-device.xml
index 4a3a6b43274fb470a71025582339faa912ca5401..c1fa4579c5da1065e2179c1d511622b924f4c2d5 100644 (file)
--- a/tests/qemuxml2xmloutdata/blkiotune-device.xml
+++ b/tests/qemuxml2xmloutdata/blkiotune-device.xml
@@ -32,7 +32,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/blkiotune.xml b/tests/qemuxml2xmloutdata/blkiotune.xml
index 79f899d717ca9c01f279874ad80d5a72b0fb0e0a..8a80c8c15f9376e7bda018a34f78d29f1f3f7136 100644 (file)
--- a/tests/qemuxml2xmloutdata/blkiotune.xml
+++ b/tests/qemuxml2xmloutdata/blkiotune.xml
@@ -16,7 +16,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/boot-cdrom.xml b/tests/qemuxml2xmloutdata/boot-cdrom.xml
index 4fbf7ca78699026ccbc23fc25d76f1d3df1a670d..5778f5da41f6ecf50869da7ad7da11edae7b381f 100644 (file)
--- a/tests/qemuxml2xmloutdata/boot-cdrom.xml
+++ b/tests/qemuxml2xmloutdata/boot-cdrom.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='cdrom'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/cdrom'/>

diff --git a/tests/qemuxml2xmloutdata/boot-floppy.xml b/tests/qemuxml2xmloutdata/boot-floppy.xml
index cc97b6a66fdc9c5cf55b6bcaded2eb8d3c032fbc..5af9ebb4b8e51446f9e4b2b9eab32a81a0769fa2 100644 (file)
--- a/tests/qemuxml2xmloutdata/boot-floppy.xml
+++ b/tests/qemuxml2xmloutdata/boot-floppy.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml b/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml
index 8962ffbdd9a0f5ceba81d17a261932959f2272b7..fc9b2df8ceb4659533ef104042556cc5140a31e5 100644 (file)
--- a/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml
+++ b/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml
@@ -14,7 +14,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='cdrom'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/cdrom'/>

diff --git a/tests/qemuxml2xmloutdata/boot-menu-disable.xml b/tests/qemuxml2xmloutdata/boot-menu-disable.xml
index 8962ffbdd9a0f5ceba81d17a261932959f2272b7..fc9b2df8ceb4659533ef104042556cc5140a31e5 100644 (file)
--- a/tests/qemuxml2xmloutdata/boot-menu-disable.xml
+++ b/tests/qemuxml2xmloutdata/boot-menu-disable.xml
@@ -14,7 +14,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='cdrom'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/cdrom'/>

diff --git a/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml b/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml
index 90f323a1e2c825b2f277644f0bad52695b413c0a..654b8fec27841632c68e86dfacd228418c96785f 100644 (file)
--- a/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml
+++ b/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml
@@ -14,7 +14,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='cdrom'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/cdrom'/>

diff --git a/tests/qemuxml2xmloutdata/boot-multi.xml b/tests/qemuxml2xmloutdata/boot-multi.xml
index 390d198f25d285f4b6bddb4601fbe579e4c8d890..34f810c9282093668dfaaabc62b57114c4eca867 100644 (file)
--- a/tests/qemuxml2xmloutdata/boot-multi.xml
+++ b/tests/qemuxml2xmloutdata/boot-multi.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='cdrom'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/cdrom'/>

diff --git a/tests/qemuxml2xmloutdata/boot-network.xml b/tests/qemuxml2xmloutdata/boot-network.xml
index ceb7a93b13df3b8a5cf77066b5d5b0a330930f97..4ac5309ce158ca7fee3e39ab1c85f5ed72df3b07 100644 (file)
--- a/tests/qemuxml2xmloutdata/boot-network.xml
+++ b/tests/qemuxml2xmloutdata/boot-network.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/boot-order.xml b/tests/qemuxml2xmloutdata/boot-order.xml
index 1e4ca91d0524c3db6f74c385b287e96af314d27d..fee34a4cea67ea2cb0aa2dcfc973cf801540bcbf 100644 (file)
--- a/tests/qemuxml2xmloutdata/boot-order.xml
+++ b/tests/qemuxml2xmloutdata/boot-order.xml
@@ -12,7 +12,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/channel-guestfwd.xml b/tests/qemuxml2xmloutdata/channel-guestfwd.xml
index 3eeddda0b4e57af0e1331c4ecb0a4696c81e7584..6a5a63eacf1c9b1a7f770599ef8a37817faf8ac4 100644 (file)
--- a/tests/qemuxml2xmloutdata/channel-guestfwd.xml
+++ b/tests/qemuxml2xmloutdata/channel-guestfwd.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/channel-virtio-auto.xml b/tests/qemuxml2xmloutdata/channel-virtio-auto.xml
index 3bed3b6c0d0e7a19fb4a33d06cdac4cb709452ae..38eccce8d3eb7246238dccef094c779c2f430dea 100644 (file)
--- a/tests/qemuxml2xmloutdata/channel-virtio-auto.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio-auto.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml b/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml
index 4487ea47dd7159c7a298b18b4146ab357c2c7d60..9a28e4f01205934d6e9546630ec862a81cd8e2f3 100644 (file)
--- a/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml b/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml
index 0a427ba48470db574d980bc9c5991ff250f4abf4..24925cc89ab36ea182825e81c37dda67c09b6901 100644 (file)
--- a/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/channel-virtio.xml b/tests/qemuxml2xmloutdata/channel-virtio.xml
index 5400658353b9ea772d1333a61a9c5aa839c432bb..31252614845f329efc243729cc38e759f777751a 100644 (file)
--- a/tests/qemuxml2xmloutdata/channel-virtio.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/clock-catchup.xml b/tests/qemuxml2xmloutdata/clock-catchup.xml
index e171fae534b4135e44ee8c05aafb8686d4d80b27..0468b9129bc4e721fa59d2fbf753c2d22428266e 100644 (file)
--- a/tests/qemuxml2xmloutdata/clock-catchup.xml
+++ b/tests/qemuxml2xmloutdata/clock-catchup.xml
@@ -23,7 +23,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/clock-localtime.xml b/tests/qemuxml2xmloutdata/clock-localtime.xml
index 3ba3000bc274fa145839b23e11c34201226ebc51..7a01365de881484e8bcca223c3f8214e5f970936 100644 (file)
--- a/tests/qemuxml2xmloutdata/clock-localtime.xml
+++ b/tests/qemuxml2xmloutdata/clock-localtime.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml b/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml
index 49b235fe9034f5aed2fc44c413655310b0d10649..e166eb441719dd5c4ceb428b3794b268bf1b7a35 100644 (file)
--- a/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml
+++ b/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/clock-utc.xml b/tests/qemuxml2xmloutdata/clock-utc.xml
index c1e963a78da698a114c7e7e6e2b0360b7117f31b..f8051b7607b1c4941e957626be0a03c182d03298 100644 (file)
--- a/tests/qemuxml2xmloutdata/clock-utc.xml
+++ b/tests/qemuxml2xmloutdata/clock-utc.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/console-compat-auto.xml b/tests/qemuxml2xmloutdata/console-compat-auto.xml
index ec7ca296e3e250835d125f85a56b6ba2ec793417..ea9c6449fe4ec319d16fe2aa882fb8b7329bebef 100644 (file)
--- a/tests/qemuxml2xmloutdata/console-compat-auto.xml
+++ b/tests/qemuxml2xmloutdata/console-compat-auto.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/console-compat.xml b/tests/qemuxml2xmloutdata/console-compat.xml
index 6a52800a334f7f65e3e18c43372a551b92ebdedd..06c4b0f6bc4a1412b726a1c86f341a9345caeb67 100644 (file)
--- a/tests/qemuxml2xmloutdata/console-compat.xml
+++ b/tests/qemuxml2xmloutdata/console-compat.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/console-compat2.xml b/tests/qemuxml2xmloutdata/console-compat2.xml
index 8c7bbb768ee055686f9d48f6c9d1d86a2f778e22..e97f9cef31db50af10e98f9a5aa8ab7b60d944a3 100644 (file)
--- a/tests/qemuxml2xmloutdata/console-compat2.xml
+++ b/tests/qemuxml2xmloutdata/console-compat2.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/console-virtio-many.xml b/tests/qemuxml2xmloutdata/console-virtio-many.xml
index 4f718dfbd881c7493c0289d387fe791e74b14591..0bb429c2de627750a3a2bd3f73d5ecdd84411d69 100644 (file)
--- a/tests/qemuxml2xmloutdata/console-virtio-many.xml
+++ b/tests/qemuxml2xmloutdata/console-virtio-many.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/console-virtio.xml b/tests/qemuxml2xmloutdata/console-virtio.xml
index 334cc21c2efc95d33a89915a652c0d7cd61a18b6..23983f67ed2e7141aac16dc4e182a36947c3ce7b 100644 (file)
--- a/tests/qemuxml2xmloutdata/console-virtio.xml
+++ b/tests/qemuxml2xmloutdata/console-virtio.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml b/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml
index f810a70baff400d3c62fa3a6c3b1af8f8ab48246..6a9f0963caf35c2ddc49114e0e0edd9cafbfd096 100644 (file)
--- a/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml
+++ b/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml b/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
index 8aa954e478a3c05a873b79c435e8014dde468d86..f528efa8dbddaa2e935671adb8d6627a13c41867 100644 (file)
--- a/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
+++ b/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
@@ -21,7 +21,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml b/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
index adc8393d7998f1b51ad54b09422919fc30462cb2..0353b72c02b2adc4cacdf0788bf2bc81a28d03be 100644 (file)
--- a/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
+++ b/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
@@ -21,7 +21,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-features.xml b/tests/qemuxml2xmloutdata/cpu-host-model-features.xml
index 6480bd549409f59d35bb8b8e18f410e6f98dab1b..635811ecbd7e6162187c4c875b6fb2b755acf3d9 100644 (file)
--- a/tests/qemuxml2xmloutdata/cpu-host-model-features.xml
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-features.xml
@@ -23,7 +23,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml b/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml
index 6d47bd84fe3c0d31f5be4c050a18babeb199b31f..9a961eb1a1deba0a8f1c60c3bc8cfbe0f85c7390 100644 (file)
--- a/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml
+++ b/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml
@@ -23,7 +23,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/cpu-kvmclock.xml b/tests/qemuxml2xmloutdata/cpu-kvmclock.xml
index a01879fd3af274777f5f958428baead0ed8d43a3..3f89c8fec7bac31906580aba8ea65c428d255a24 100644 (file)
--- a/tests/qemuxml2xmloutdata/cpu-kvmclock.xml
+++ b/tests/qemuxml2xmloutdata/cpu-kvmclock.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/cputune-iothreads.xml b/tests/qemuxml2xmloutdata/cputune-iothreads.xml
index e647cf70e727e68548ed3b1e4b8f31e0dbc6782a..57649745f04d62a2edf127fb53f3a833cbd02738 100644 (file)
--- a/tests/qemuxml2xmloutdata/cputune-iothreads.xml
+++ b/tests/qemuxml2xmloutdata/cputune-iothreads.xml
@@ -24,7 +24,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml b/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml
index 0ba6b5ae93434f6fb81375f5f2c0c70e609d7ae5..694723d26100a44dd2589a92d232ecf6cfd66a22 100644 (file)
--- a/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml
+++ b/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml
@@ -27,7 +27,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml b/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml
index a496f13e149fa8453214f9ecdc3144ddd8cd58b2..6103531ed16d93d933095add0c657035be22376f 100644 (file)
--- a/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml
+++ b/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml
@@ -27,7 +27,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/cputune-zero-shares.xml b/tests/qemuxml2xmloutdata/cputune-zero-shares.xml
index cea21402dc0928fb0fb5fc5782b44fd4ddf6b533..8837b69eb339817a39dfdf53c70be69e921d88e0 100644 (file)
--- a/tests/qemuxml2xmloutdata/cputune-zero-shares.xml
+++ b/tests/qemuxml2xmloutdata/cputune-zero-shares.xml
@@ -21,7 +21,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/cputune.xml b/tests/qemuxml2xmloutdata/cputune.xml
index 612eb76e71e801101acd3b1e8c7b95caa5f8d06d..ee789cdc85e8a4aa8e88d9c3de81e377cd74754f 100644 (file)
--- a/tests/qemuxml2xmloutdata/cputune.xml
+++ b/tests/qemuxml2xmloutdata/cputune.xml
@@ -25,7 +25,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/disk-active-commit-active.xml b/tests/qemuxml2xmloutdata/disk-active-commit-active.xml
index cc26af1096adcceb40126f2f8cbb1f4c26380966..739941b470d2db3077a1014a92f85efa216c7b3a 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-active-commit-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-active-commit-active.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source file='/tmp/HostVG/QEMUGuest1-snap'/>

diff --git a/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml b/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml
index b14345049d92eb24098b06a59e5099d8a042539b..5488e15b84d9eda3b354302b7ca07130c44bad6d 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source file='/tmp/HostVG/QEMUGuest1-snap'/>

diff --git a/tests/qemuxml2xmloutdata/disk-aio.xml b/tests/qemuxml2xmloutdata/disk-aio.xml
index e1ab88e48d516ddf339275eb6a1bfa3e58ae17b9..01c1468b097496428e63d7c0afa6a01ef6ce0db1 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-aio.xml
+++ b/tests/qemuxml2xmloutdata/disk-aio.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='qcow2' cache='none' io='native'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-active.xml b/tests/qemuxml2xmloutdata/disk-backing-chains-active.xml
index e24956f106a1088f0e6eaa42a522618cf115d26a..866bd9ca7e94341529e78033c44f712effc99c0d 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-backing-chains-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-backing-chains-active.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='network' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source protocol='gluster' name='Volume2/Image'>

diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml b/tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml
index e39e218873d761ea6b575cf80d25c19036b1803e..0d5ca917d38c2b50e13462328ac23e9357086e98 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='network' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source protocol='gluster' name='Volume2/Image'>

diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml b/tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml
index 2b5bc9e1b41876bc184ca16d967eafeab709505f..2569185ddf3ecc74cbfb4d18ff0a5456ad21407f 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='network' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source protocol='gluster' name='Volume2/Image' index='2'>

diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml b/tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml
index 29d1ad002d9cefd2e8a8aeb3ea2d2b6e209810d7..a1c0fb4620924ef3a479e92c607b1fdb3ed999d0 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='network' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source protocol='gluster' name='Volume2/Image'>

diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-noindex.xml b/tests/qemuxml2xmloutdata/disk-backing-chains-noindex.xml
index 29d1ad002d9cefd2e8a8aeb3ea2d2b6e209810d7..a1c0fb4620924ef3a479e92c607b1fdb3ed999d0 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-backing-chains-noindex.xml
+++ b/tests/qemuxml2xmloutdata/disk-backing-chains-noindex.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='network' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source protocol='gluster' name='Volume2/Image'>

diff --git a/tests/qemuxml2xmloutdata/disk-boot-cdrom.xml b/tests/qemuxml2xmloutdata/disk-boot-cdrom.xml
index 49c1a69b6d713c4a971c1d177fd6741c97a249fa..3c6b557e1f05cdec890fed87237696ed0c8ce62c 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-boot-cdrom.xml
+++ b/tests/qemuxml2xmloutdata/disk-boot-cdrom.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/disk-boot-disk.xml b/tests/qemuxml2xmloutdata/disk-boot-disk.xml
index 34ea2c9d6d7086629456b3d32ed802c8f0ce49c4..86f3c878a8742dc7454db3998b3c0d598f5c1c81 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-boot-disk.xml
+++ b/tests/qemuxml2xmloutdata/disk-boot-disk.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/disk-cache.xml b/tests/qemuxml2xmloutdata/disk-cache.xml
index cba4067f0df679ac742be1dbd044b91ab7ee965c..b81c9c2368651bd462311481f950d1899d81cc2d 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-cache.xml
+++ b/tests/qemuxml2xmloutdata/disk-cache.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='qcow2' cache='writeback'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/disk-cdrom-bus-other.xml b/tests/qemuxml2xmloutdata/disk-cdrom-bus-other.xml
index e5eb7d6a985c5fb488d97325715a2a3789456208..10262e40d79aff323b091d0adc5284268de03545 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-cdrom-bus-other.xml
+++ b/tests/qemuxml2xmloutdata/disk-cdrom-bus-other.xml
@@ -14,7 +14,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='cdrom'>
       <driver name='qemu' type='raw'/>
       <source file='/root/boot.iso'/>

diff --git a/tests/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid.x86_64-latest.xml
index f7772d832cddc026296f3156001c8b79186b1eec..b0eaeb10ba3bc6157e6d7cd2ec2c48a342a77063 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid.x86_64-latest.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='cdrom'>
       <driver name='qemu' type='raw'/>
       <target dev='hdd' bus='ide'/>

diff --git a/tests/qemuxml2xmloutdata/disk-cdrom.xml b/tests/qemuxml2xmloutdata/disk-cdrom.xml
index 769678593048daa6338d6ae99081eb704e0ed8f6..3e6475c2768e9971bb27d253be3f9dc84000c708 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-cdrom.xml
+++ b/tests/qemuxml2xmloutdata/disk-cdrom.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/disk-error-policy.xml b/tests/qemuxml2xmloutdata/disk-error-policy.xml
index 0e534a1addcc28dca5c5acfb8d205796bbe552e3..2a091eb2db62bd3d7d7a39ebb7d37bd0d14f4577 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-error-policy.xml
+++ b/tests/qemuxml2xmloutdata/disk-error-policy.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='qcow2' cache='none' error_policy='stop'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/disk-fat.xml b/tests/qemuxml2xmloutdata/disk-fat.xml
index aae0334dffe867082bb11a4a61d06d90edac098d..d716c1f76f379a235c6fdd300f05b4abc5756d4b 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-fat.xml
+++ b/tests/qemuxml2xmloutdata/disk-fat.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='dir' device='disk'>
       <driver name='qemu' type='fat'/>
       <source dir='/var/somefiles'/>

diff --git a/tests/qemuxml2xmloutdata/disk-floppy.xml b/tests/qemuxml2xmloutdata/disk-floppy.xml
index c00508f36c2fb36470d6c8840c320b49e9f71aba..2c2402a67109e2222ecb45f62b741216d11dae4c 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-floppy.xml
+++ b/tests/qemuxml2xmloutdata/disk-floppy.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/disk-fmt-qcow.xml b/tests/qemuxml2xmloutdata/disk-fmt-qcow.xml
index c12e6d2bdfddd6d7b8f7b4b3a4c7742f82306d8c..e10748ffce2047c33b7dff0af77ae43ac6efe644 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-fmt-qcow.xml
+++ b/tests/qemuxml2xmloutdata/disk-fmt-qcow.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/disk-mirror-active.xml b/tests/qemuxml2xmloutdata/disk-mirror-active.xml
index bebdb849c210b4c6a9ca2160e77bb5db93e517ee..17fb061d49de68919a0cc5294c6f308fab88bbbf 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-mirror-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-active.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml b/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml
index 5c9b72738ddaf1603ae4e1a2f99904ec208b39f4..157ffcf6b2b754ca3f83dcc84b8c377461700439 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/disk-mirror-old-active.xml b/tests/qemuxml2xmloutdata/disk-mirror-old-active.xml
index f8a885aec84211adea87d7b52d69d6237fcf5173..14d4ed35228d44f825253adcd0e9b48e68b425d4 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-mirror-old-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-old-active.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml b/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml
index 5c9b72738ddaf1603ae4e1a2f99904ec208b39f4..157ffcf6b2b754ca3f83dcc84b8c377461700439 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/disk-network-gluster.xml b/tests/qemuxml2xmloutdata/disk-network-gluster.xml
index 2c7c46b013ed2ec31c7d582fe42ae151de36b0e1..0b596df987876008eac8ded70ddb0f4f04181a35 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-network-gluster.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-gluster.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
       <source protocol='gluster' name='Volume1/Image'>

diff --git a/tests/qemuxml2xmloutdata/disk-network-iscsi.xml b/tests/qemuxml2xmloutdata/disk-network-iscsi.xml
index f1348d583efffa5e43975746097279e2134ab677..757b9b7b52cc9471c31d95d1da0e3baf769e95d0 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-network-iscsi.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-iscsi.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
       <source protocol='iscsi' name='iqn.1992-01.com.example/0'>

diff --git a/tests/qemuxml2xmloutdata/disk-network-nbd.xml b/tests/qemuxml2xmloutdata/disk-network-nbd.xml
index 818e8d7d7cb6ecc0d31480311c674e66b6308baf..0f169ca537efcab4c20875b63c95ceeab1370850 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-network-nbd.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-nbd.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
       <source protocol='nbd'>

diff --git a/tests/qemuxml2xmloutdata/disk-network-rbd.xml b/tests/qemuxml2xmloutdata/disk-network-rbd.xml
index a870bb82f847f167eeaab8fbd4f75b0bec69ed6b..7c74604f43608d6ec1b64c4c231ca831a4ef2317 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-network-rbd.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-rbd.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
       <source protocol='rbd' name='pool/image'>

diff --git a/tests/qemuxml2xmloutdata/disk-network-sheepdog.xml b/tests/qemuxml2xmloutdata/disk-network-sheepdog.xml
index f4b8029f648f71ef22aaa02e6c51c6f9ed363cf4..bbe3998e88f2ccf2f2f298f9ccac85e2b80cad98 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-network-sheepdog.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-sheepdog.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMU,Guest,,1'/>

diff --git a/tests/qemuxml2xmloutdata/disk-network-source-auth.xml b/tests/qemuxml2xmloutdata/disk-network-source-auth.xml
index 9dc063dea93cdf500e89526184035c471eaa05c5..b9f06448c10a15bb9d2a9493bb5a73978ca5b20a 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-network-source-auth.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-source-auth.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
       <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1'>

diff --git a/tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml b/tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml
index 012b3cc26324d3920aad74496bf8f3ae7fef7565..d02db8fb0d1512278f7ce1c582bb084820d5849a 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml
+++ b/tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml b/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml
index c36f07db1cf8e37272db1b570fa7546c25718d9a..080d20d0df2e064031a59df626bc7635cec0c479 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml
+++ b/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='cdrom'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml b/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml
index 604ee8c9e39e2b12bd7e13de0eab59113e4efb71..99bbd119eb984e5f3106dfdc40b6ceb685884054 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml
+++ b/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='lun' rawio='no' sgio='unfiltered'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/disk-scsi.xml b/tests/qemuxml2xmloutdata/disk-scsi.xml
index 45fed6423ab072c78ed92c957e1df5a5ff0d3322..062a9073032c15eba8f76c76ecffa238c7a9404e 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-scsi.xml
+++ b/tests/qemuxml2xmloutdata/disk-scsi.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/disk-serial.xml b/tests/qemuxml2xmloutdata/disk-serial.xml
index a803cd959c7190db8565040c05ec04979d774598..e29cefe0e8e33137c2792524c425f448e6fb8721 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-serial.xml
+++ b/tests/qemuxml2xmloutdata/disk-serial.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml b/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml
index 29706200dbcd663348f2a605e6fb26aff2b9ec79..35ffadc26c2efe380eb24e2d6a9118eee3747b6d 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml
+++ b/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='volume' device='cdrom'>
       <driver name='qemu'/>
       <source pool='pool-iscsi-auth' volume='unit:0:0:1' mode='host'>

diff --git a/tests/qemuxml2xmloutdata/disk-source-pool.xml b/tests/qemuxml2xmloutdata/disk-source-pool.xml
index 807d1099edcd37cc4f8aace7df27bdd8f949bf5c..d7d9457452e6c14650439c5d8e320ef1d7cf202d 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-source-pool.xml
+++ b/tests/qemuxml2xmloutdata/disk-source-pool.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='volume' device='cdrom'>
       <driver name='qemu'/>
       <source pool='pool-disk' volume='block+cdrom'>

diff --git a/tests/qemuxml2xmloutdata/disk-usb-device.xml b/tests/qemuxml2xmloutdata/disk-usb-device.xml
index 07282c87a010ae90c7f416b9caa7c773e5ca9abf..60342112b3c1077eaff1c126585f75bcc1bf5589 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-usb-device.xml
+++ b/tests/qemuxml2xmloutdata/disk-usb-device.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/disk-virtio.xml b/tests/qemuxml2xmloutdata/disk-virtio.xml
index 6d3d793c543f8bf27aa39ce06acfa5e992b17b41..884f7aadb4ba6918b9b62919d2b05529f48f983e 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-virtio.xml
+++ b/tests/qemuxml2xmloutdata/disk-virtio.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/encrypted-disk.xml b/tests/qemuxml2xmloutdata/encrypted-disk.xml
index 3c9d2fbafc57169afeabc1ced54656d1b56f36d0..dbde16dbe36d60c26ac9ac97c50998dccb0bd5f3 100644 (file)
--- a/tests/qemuxml2xmloutdata/encrypted-disk.xml
+++ b/tests/qemuxml2xmloutdata/encrypted-disk.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source file='/storage/guest_disks/encryptdisk'/>

diff --git a/tests/qemuxml2xmloutdata/eoi-disabled.xml b/tests/qemuxml2xmloutdata/eoi-disabled.xml
index 90ed25d6a26e7552e70eb812e027605d28536867..6bea44a47c5e5ad3c85b52076336c85b8b57aa8d 100644 (file)
--- a/tests/qemuxml2xmloutdata/eoi-disabled.xml
+++ b/tests/qemuxml2xmloutdata/eoi-disabled.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/eoi-enabled.xml b/tests/qemuxml2xmloutdata/eoi-enabled.xml
index 13b3b73e31c1b2bb285cc318ed90d9fe447de6b1..b416894d88c1111e263395cc7e7b599e3ce23fe5 100644 (file)
--- a/tests/qemuxml2xmloutdata/eoi-enabled.xml
+++ b/tests/qemuxml2xmloutdata/eoi-enabled.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/floppy-drive-fat.xml b/tests/qemuxml2xmloutdata/floppy-drive-fat.xml
index 0f561e773a3848b71589c00f98504da43ad13b9f..7e573d31d22f0077f938aff13be4abd395966c09 100644 (file)
--- a/tests/qemuxml2xmloutdata/floppy-drive-fat.xml
+++ b/tests/qemuxml2xmloutdata/floppy-drive-fat.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='dir' device='floppy'>
       <driver name='qemu' type='fat'/>
       <source dir='/var/somefiles'/>

diff --git a/tests/qemuxml2xmloutdata/graphics-egl-headless-rendernode.xml b/tests/qemuxml2xmloutdata/graphics-egl-headless-rendernode.xml
index 9b7ac899280623930e646cd9a658d61f386af843..8800d54008c1f78b2df0d12917c24719c7f03cf8 100644 (file)
--- a/tests/qemuxml2xmloutdata/graphics-egl-headless-rendernode.xml
+++ b/tests/qemuxml2xmloutdata/graphics-egl-headless-rendernode.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/graphics-listen-network.xml b/tests/qemuxml2xmloutdata/graphics-listen-network.xml
index 144d315b570491fbd56097c6d287318c426ddb45..4df676b10e7154ed9468ad027aa1fb4a49188c67 100644 (file)
--- a/tests/qemuxml2xmloutdata/graphics-listen-network.xml
+++ b/tests/qemuxml2xmloutdata/graphics-listen-network.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/graphics-listen-network2.xml b/tests/qemuxml2xmloutdata/graphics-listen-network2.xml
index ad44f674434e155db862f45045b1b0090d1161c1..a4a9ccea2ed8e832f2d15b798e89a7ab94ca0dd9 100644 (file)
--- a/tests/qemuxml2xmloutdata/graphics-listen-network2.xml
+++ b/tests/qemuxml2xmloutdata/graphics-listen-network2.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.xml b/tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.xml
index 3897a0ae82b71216f700fab4716cfc8ce69e22ec..6c5043d8eb2583ec9e6051d89caa87d5d4105af2 100644 (file)
--- a/tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.xml
+++ b/tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/graphics-sdl.xml b/tests/qemuxml2xmloutdata/graphics-sdl.xml
index 961ed52e599b3ccba9a2371e33c766f1b54c1b10..a21d87c2a535b66d5f869110d1a4d1b7f8ec311a 100644 (file)
--- a/tests/qemuxml2xmloutdata/graphics-sdl.xml
+++ b/tests/qemuxml2xmloutdata/graphics-sdl.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.xml b/tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.xml
index d41bb6e3f6226a5d21884341a23a9acf361269c3..03bf7cf10767ff1265b96d65ebd6ab01770ab487 100644 (file)
--- a/tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.xml
+++ b/tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/graphics-spice-auto-socket.xml b/tests/qemuxml2xmloutdata/graphics-spice-auto-socket.xml
index 12dcc75f5a0f60bb0adaac60ec48a604949f9bae..e8534d961a71787368ff9accc513410101ff7a2a 100644 (file)
--- a/tests/qemuxml2xmloutdata/graphics-spice-auto-socket.xml
+++ b/tests/qemuxml2xmloutdata/graphics-spice-auto-socket.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/graphics-spice-compression.xml b/tests/qemuxml2xmloutdata/graphics-spice-compression.xml
index 27854421c5d11c6947df0354b3117b47188e4ff2..83d656e4f09c64057716d5fed83b88e3ba7206dc 100644 (file)
--- a/tests/qemuxml2xmloutdata/graphics-spice-compression.xml
+++ b/tests/qemuxml2xmloutdata/graphics-spice-compression.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml b/tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml
index 6d96264914022e8435dd385a098c098df1ddf49b..cf3119ae8de0d355fe1b49d47a429db326fdeb12 100644 (file)
--- a/tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml
+++ b/tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml b/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml
index 78af3846df77f281b1300d7e5d2afd2d288926bc..9e311d8f2e557d1693577388809c007f88d2bc23 100644 (file)
--- a/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml
+++ b/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/graphics-spice-socket.xml b/tests/qemuxml2xmloutdata/graphics-spice-socket.xml
index 0c6ab900a506edcd017702abf5a2017a63a0d7e0..2dd9beb37f96b6d08dddd413fb2ef6ad7d66e4dd 100644 (file)
--- a/tests/qemuxml2xmloutdata/graphics-spice-socket.xml
+++ b/tests/qemuxml2xmloutdata/graphics-spice-socket.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml b/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml
index 87d04c886681d6cc626451a40c6d1ac72abff5bf..3f0babd8fcf58dabd81b2065c07a2396e03796b2 100644 (file)
--- a/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml
+++ b/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml
@@ -38,7 +38,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source file='/var/lib/libvirt/images/f14.img'/>

diff --git a/tests/qemuxml2xmloutdata/graphics-spice.xml b/tests/qemuxml2xmloutdata/graphics-spice.xml
index 1822bc35cc921d235a3e3285dd7fef49e1e8f104..c45c825644af0f38238e1856f51ca52d924add2b 100644 (file)
--- a/tests/qemuxml2xmloutdata/graphics-spice.xml
+++ b/tests/qemuxml2xmloutdata/graphics-spice.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket-cfg.xml b/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket-cfg.xml
index 1cf420d8905bcbfdf5186cc90ddda2cdb88898a4..9a70bd510c002c0965b055b38c241479f63e09dd 100644 (file)
--- a/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket-cfg.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket-cfg.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket.xml b/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket.xml
index 962b3047e66a14f9e1b9da7c82c45693f9c7f591..57fe2ee0e675b5efbdc36aebee73d5b9ffdb171a 100644 (file)
--- a/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.xml b/tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.xml
index 4155c10397dd30e2068cf0441fe2f84295f247b0..0376383722c43f3478a258a03417da6adc02b819 100644 (file)
--- a/tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-no-listen-attr.xml b/tests/qemuxml2xmloutdata/graphics-vnc-no-listen-attr.xml
index 89da5dff9ce8446c33f171b8de812ad2c426c20a..cc83ca4b79ad972fcb5f75cd067f349439cdfa88 100644 (file)
--- a/tests/qemuxml2xmloutdata/graphics-vnc-no-listen-attr.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-no-listen-attr.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-active.xml b/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-active.xml
index 2b4690df3e4420b913e61d0d595525cd54f2e213..4415aa925324b356c63e8d3acfa8fd01b71c3b0a 100644 (file)
--- a/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-active.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-active.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-inactive.xml b/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-inactive.xml
index 1cf420d8905bcbfdf5186cc90ddda2cdb88898a4..9a70bd510c002c0965b055b38c241479f63e09dd 100644 (file)
--- a/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-inactive.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-inactive.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-sasl.xml b/tests/qemuxml2xmloutdata/graphics-vnc-sasl.xml
index 7b53c2ae1f24ae07360276eed2107bae6d572c11..d46a2c454247f19b54844713a807bb938ae3456e 100644 (file)
--- a/tests/qemuxml2xmloutdata/graphics-vnc-sasl.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-sasl.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-socket.xml b/tests/qemuxml2xmloutdata/graphics-vnc-socket.xml
index 24419738ca1d18a2f788692f57d613a6c931aa1d..314fa8437256dda45c06890bfbca9f348d303031 100644 (file)
--- a/tests/qemuxml2xmloutdata/graphics-vnc-socket.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-socket.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-tls.xml b/tests/qemuxml2xmloutdata/graphics-vnc-tls.xml
index dcbc4bcf1d54f26813d9c4823dcaca9862252be8..42d1adceb8dac42759bcc466b0562288edb32f54 100644 (file)
--- a/tests/qemuxml2xmloutdata/graphics-vnc-tls.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-tls.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-websocket.xml b/tests/qemuxml2xmloutdata/graphics-vnc-websocket.xml
index ae54f2d906540534726b8796a233074e05735b17..ddc4c6730238800485edd7cb4dc06dfeefe09da7 100644 (file)
--- a/tests/qemuxml2xmloutdata/graphics-vnc-websocket.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-websocket.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/graphics-vnc.xml b/tests/qemuxml2xmloutdata/graphics-vnc.xml
index 89da5dff9ce8446c33f171b8de812ad2c426c20a..cc83ca4b79ad972fcb5f75cd067f349439cdfa88 100644 (file)
--- a/tests/qemuxml2xmloutdata/graphics-vnc.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/hostdev-mdev-display.xml b/tests/qemuxml2xmloutdata/hostdev-mdev-display.xml
index d0a85913ac5abc2f427da5a4a67fe64eefeda52e..d8a71e1f25bf5b9a5b281a381afb15291d6c7b20 100644 (file)
--- a/tests/qemuxml2xmloutdata/hostdev-mdev-display.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-mdev-display.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml b/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml
index 9d35fac366d485967867b2aa441744d1aa2af544..2d66ebaac656fa54e41b1c963e6e1cab8ab9553e 100644 (file)
--- a/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/hostdev-pci-address.xml b/tests/qemuxml2xmloutdata/hostdev-pci-address.xml
index 59cb86e1d58bcd95a9a47a26709565924442cbb6..e923b50b058e4d88a52f29bf0800ce8fe1233c45 100644 (file)
--- a/tests/qemuxml2xmloutdata/hostdev-pci-address.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-pci-address.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest2'/>

diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
index 3b4242e40959f282715c2ec4723c6573401dedec..e23d3d3901873246ef147662f10ffca715fcf208 100644 (file)
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest2'/>

diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
index 1b0da12f6087fa34734aad0191f4dc17101365da..6c76c5c592dc34d550f045d8652dc1788d6fd03e 100644 (file)
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest2'/>

diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml
index beeb3cb11e75b259faffa5d448152a145243625a..d0e025d81519117545790b53c510134db6f122f9 100644 (file)
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest2'/>

diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml
index cff162b4eada484bbf66e87282fa38fc6454d30a..463357a20c3579aaf525a51b717e48d09e0a7ea4 100644 (file)
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest2'/>

diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml
index d8931da38aef63517d1f351d2467a48b2a0974ae..6fb6979399c585cfc98707c6f65d178a30379e53 100644 (file)
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest2'/>

diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml
index df1375d1a564b7c075174f843462256ea15e26c0..16b27e72bf0a31dcae642e7f5dba163ca7c8c505 100644 (file)
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest2'/>

diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml
index dd252f8524a275d47ddc387b1673c1b9d7cd235f..17bb7e3904dda175eaa5702f8bd421823ec5a2bb 100644 (file)
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest2'/>

diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml
index 05cefc003b8ecc584fb715c5ddaaf45974c97adb..1513429773b4063935f922d9faa0427ba39ee3a8 100644 (file)
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest2'/>

diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
index 31aa2dd3b5d57e843df24a101c13f75a51490862..f8f4389cd65efe54bd974cd3ec771b70b59aaadb 100644 (file)
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest2'/>

diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
index 174096b0d9517599a08ca67a0c76502ada92c8d4..2d2bdbf0b6fe0cb7907ba1c8ac5f59fc231b449d 100644 (file)
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest2'/>

diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml
index a3886ec750c7f54c71cb30801ad5efa8dbc7497e..b6dc1dbb8fe4e830f4ea81ec35850014824f4476 100644 (file)
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest2'/>

diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml
index d31af322ac63847314bbf62038adf714ea42e4b4..4addf5ebc8780fce6d35c92a965e037972850a57 100644 (file)
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest2'/>

diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
index df878973237531015efed671dfcd481693f78ce2..81ae94318b5ed921ba450e71b8d7a84afc619ce7 100644 (file)
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest2'/>

diff --git a/tests/qemuxml2xmloutdata/hostdev-usb-address.xml b/tests/qemuxml2xmloutdata/hostdev-usb-address.xml
index 9e3377317aee0bba4b01ccae32ad14456d4600a9..4a2d7f6439dedeaf11100cff0d2663491957e783 100644 (file)
--- a/tests/qemuxml2xmloutdata/hostdev-usb-address.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-usb-address.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio.xml b/tests/qemuxml2xmloutdata/hostdev-vfio.xml
index 15a845f4d1b7d12c2c5370a4a8f0d92fd2c197b7..aa17a3e212c191fe62f700c7929edca8e104ced8 100644 (file)
--- a/tests/qemuxml2xmloutdata/hostdev-vfio.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-vfio.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest2'/>

diff --git a/tests/qemuxml2xmloutdata/hugepages-default.xml b/tests/qemuxml2xmloutdata/hugepages-default.xml
index 40043434eef98a2df6328677a3f0f98b19968641..89916f45818435e3082ec63295e93b2ed852413f 100644 (file)
--- a/tests/qemuxml2xmloutdata/hugepages-default.xml
+++ b/tests/qemuxml2xmloutdata/hugepages-default.xml
@@ -16,7 +16,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/hugepages-nodeset.xml b/tests/qemuxml2xmloutdata/hugepages-nodeset.xml
index ac219a7800bc8f9576e4fb68396552c79455f3c6..ce67853f267904f8f25a1187e6a217cea9167107 100644 (file)
--- a/tests/qemuxml2xmloutdata/hugepages-nodeset.xml
+++ b/tests/qemuxml2xmloutdata/hugepages-nodeset.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/hugepages-numa-default-2M.xml b/tests/qemuxml2xmloutdata/hugepages-numa-default-2M.xml
index 3777824e1a3027a817ff07e0e07fbae87a291d87..b320f69a2d29b538eb1acd775644506b23dcae40 100644 (file)
--- a/tests/qemuxml2xmloutdata/hugepages-numa-default-2M.xml
+++ b/tests/qemuxml2xmloutdata/hugepages-numa-default-2M.xml
@@ -24,7 +24,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml
index 1230edfd0273132baf2043fba3a4f973c12066f6..977f5ccd1982738670147a76fc64c7ddd20c3bd5 100644 (file)
--- a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml
+++ b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml
@@ -24,7 +24,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset.xml b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset.xml
index affd124048fbfa2116317ecc542bca4d03029991..e57bb5544985cc647b256a96b1b63726706c12a0 100644 (file)
--- a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset.xml
+++ b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset.xml
@@ -27,7 +27,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/hugepages-shared.xml b/tests/qemuxml2xmloutdata/hugepages-shared.xml
index e56d1ace83bbaabb110593ab4bb09c272357b5d9..0382614c306870f6e7b49255d2cc5e301d2d2b29 100644 (file)
--- a/tests/qemuxml2xmloutdata/hugepages-shared.xml
+++ b/tests/qemuxml2xmloutdata/hugepages-shared.xml
@@ -31,7 +31,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/hyperv-off.xml b/tests/qemuxml2xmloutdata/hyperv-off.xml
index 1b7d82b14a907a53f8e3e1bfd114e8600b5bab95..7fd8748c6f51a6fcfe6339563015776d1a7526d4 100644 (file)
--- a/tests/qemuxml2xmloutdata/hyperv-off.xml
+++ b/tests/qemuxml2xmloutdata/hyperv-off.xml
@@ -32,7 +32,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/hyperv-panic.xml b/tests/qemuxml2xmloutdata/hyperv-panic.xml
index bf8cd43231682e038a844daee7a23f6fb5a4bf53..c96a7506df9f2e97a1339a94edd3b9a99722f16a 100644 (file)
--- a/tests/qemuxml2xmloutdata/hyperv-panic.xml
+++ b/tests/qemuxml2xmloutdata/hyperv-panic.xml
@@ -16,7 +16,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/hyperv-stimer-direct.xml b/tests/qemuxml2xmloutdata/hyperv-stimer-direct.xml
index 806164beea53b328159e1ddd0a1a19a2447904e6..a04e80e575fdefe29df7a7f00ef47a8544175f78 100644 (file)
--- a/tests/qemuxml2xmloutdata/hyperv-stimer-direct.xml
+++ b/tests/qemuxml2xmloutdata/hyperv-stimer-direct.xml
@@ -23,7 +23,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/hyperv.xml b/tests/qemuxml2xmloutdata/hyperv.xml
index 5510d3dfadd79dba81ebee146eda0319f2f15934..07cfcce320d6def54a859a0a0c94fdcfb9afe1b2 100644 (file)
--- a/tests/qemuxml2xmloutdata/hyperv.xml
+++ b/tests/qemuxml2xmloutdata/hyperv.xml
@@ -32,7 +32,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/input-usbmouse.xml b/tests/qemuxml2xmloutdata/input-usbmouse.xml
index df62e5fef90cfd0860bef9f7b7541133f9fbceb5..3dbb0eee9ea0437439d8d6f1932dbf0287d42d62 100644 (file)
--- a/tests/qemuxml2xmloutdata/input-usbmouse.xml
+++ b/tests/qemuxml2xmloutdata/input-usbmouse.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/input-usbtablet.xml b/tests/qemuxml2xmloutdata/input-usbtablet.xml
index 471e05304a022dff3a2c9fc44533d877578215d2..5b5b7bd77a54f13c4a4fc9ed5294039b819ed81e 100644 (file)
--- a/tests/qemuxml2xmloutdata/input-usbtablet.xml
+++ b/tests/qemuxml2xmloutdata/input-usbtablet.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/iothreads-disk.xml b/tests/qemuxml2xmloutdata/iothreads-disk.xml
index f4170de6e2361a729f9e3671923de72fe923c24e..3eeed00703fcd9178c8246c5f1806147286a10a9 100644 (file)
--- a/tests/qemuxml2xmloutdata/iothreads-disk.xml
+++ b/tests/qemuxml2xmloutdata/iothreads-disk.xml
@@ -14,7 +14,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/iothreads-ids-partial.xml b/tests/qemuxml2xmloutdata/iothreads-ids-partial.xml
index c4a51a9ab1797cf69d757073013bac522489ac2a..fbc4cb3ab9d3b193aa2fccb212751e4ee5aae827 100644 (file)
--- a/tests/qemuxml2xmloutdata/iothreads-ids-partial.xml
+++ b/tests/qemuxml2xmloutdata/iothreads-ids-partial.xml
@@ -20,7 +20,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/iothreads-ids.xml b/tests/qemuxml2xmloutdata/iothreads-ids.xml
index ef2cfdc6fe31a72e4f33bdb2dcaa441adc30de90..2b64bc446ffe3f5687f3b62101910d38b51a3be6 100644 (file)
--- a/tests/qemuxml2xmloutdata/iothreads-ids.xml
+++ b/tests/qemuxml2xmloutdata/iothreads-ids.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.xml b/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.xml
index 29036c896454502c53d4e80422bf7158bd49aa4c..2bdc91501c220dc0bc1d7d37ad2007d6fd8c770b 100644 (file)
--- a/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.xml
+++ b/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.xml
@@ -14,7 +14,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/iothreads.xml b/tests/qemuxml2xmloutdata/iothreads.xml
index b4fa7e6e8f0f275fbba29f726362cdac7bd7d68d..c2fc2e39189a2b2eb97bc234cffe5dfd0b812afa 100644 (file)
--- a/tests/qemuxml2xmloutdata/iothreads.xml
+++ b/tests/qemuxml2xmloutdata/iothreads.xml
@@ -14,7 +14,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/kvm-features-off.xml b/tests/qemuxml2xmloutdata/kvm-features-off.xml
index a0ef9c7e9e15ddb14fa8651eeda6a114d89de07c..9068be3e7b7f8f6982dd0ba5709599e64927e062 100644 (file)
--- a/tests/qemuxml2xmloutdata/kvm-features-off.xml
+++ b/tests/qemuxml2xmloutdata/kvm-features-off.xml
@@ -20,7 +20,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/kvm-features.xml b/tests/qemuxml2xmloutdata/kvm-features.xml
index b6f16ced1dab4e97abfe0f3be29e3a6c881ec1e7..7c554671b389da11431e7e04b667594bb52435b6 100644 (file)
--- a/tests/qemuxml2xmloutdata/kvm-features.xml
+++ b/tests/qemuxml2xmloutdata/kvm-features.xml
@@ -21,7 +21,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/kvmclock.xml b/tests/qemuxml2xmloutdata/kvmclock.xml
index e502bfd125b465baa6b946740f78d34f597bac88..729b4eccd6b1a41217f3e60a4aed7b455ec9e2d2 100644 (file)
--- a/tests/qemuxml2xmloutdata/kvmclock.xml
+++ b/tests/qemuxml2xmloutdata/kvmclock.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/lease.xml b/tests/qemuxml2xmloutdata/lease.xml
index a6ba5903cc8c36aa45c6c6863381340aaf5d8654..87258c8f7e3b43c815f2b212857e8e5a4b869bd8 100644 (file)
--- a/tests/qemuxml2xmloutdata/lease.xml
+++ b/tests/qemuxml2xmloutdata/lease.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/machine-core-off.xml b/tests/qemuxml2xmloutdata/machine-core-off.xml
index 11c6bd8ed3f1865516ab0881b231f2ef6890eb63..2b7a1b471223fd7a8a7d3c65ad2466f3e650d3b4 100644 (file)
--- a/tests/qemuxml2xmloutdata/machine-core-off.xml
+++ b/tests/qemuxml2xmloutdata/machine-core-off.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/machine-core-on.xml b/tests/qemuxml2xmloutdata/machine-core-on.xml
index 286981f0768c2c4c0ee7acb60a0bb326dddec1be..37508e8782a9412cc2b65fc0c24c1d958fe33795 100644 (file)
--- a/tests/qemuxml2xmloutdata/machine-core-on.xml
+++ b/tests/qemuxml2xmloutdata/machine-core-on.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
index d26675852f616180d42f7e3269e25eaf64400793..f4a118cea5fbfde1bb5c9e2b7cb89886556267b7 100644 (file)
--- a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
+++ b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
@@ -24,7 +24,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nonuma.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nonuma.xml
index 0b6c6f7923af19016c6f9672351c55aca9750e02..7c277f01a35941d9d476c61926b9d33b038413ee 100644 (file)
--- a/tests/qemuxml2xmloutdata/memory-hotplug-nonuma.xml
+++ b/tests/qemuxml2xmloutdata/memory-hotplug-nonuma.xml
@@ -14,7 +14,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/memory-hotplug.xml b/tests/qemuxml2xmloutdata/memory-hotplug.xml
index a5d82346be72947ed8f760db7db877006a953cf7..0e02f210bcd7f352f1dedec3a51879ebc379ed0c 100644 (file)
--- a/tests/qemuxml2xmloutdata/memory-hotplug.xml
+++ b/tests/qemuxml2xmloutdata/memory-hotplug.xml
@@ -20,7 +20,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/memorybacking-set.xml b/tests/qemuxml2xmloutdata/memorybacking-set.xml
index ea15f2783f65fb5c187ccf14b50954eeba35a46f..da1ebadfd1974cf6d07370bc84fe251bcd6c155d 100644 (file)
--- a/tests/qemuxml2xmloutdata/memorybacking-set.xml
+++ b/tests/qemuxml2xmloutdata/memorybacking-set.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/memorybacking-unset.xml b/tests/qemuxml2xmloutdata/memorybacking-unset.xml
index cf21e7162bb2ec46cab49981e23ed89da233ae48..b90988d3f177f97f8d4be36d498b4d322f73c1a6 100644 (file)
--- a/tests/qemuxml2xmloutdata/memorybacking-unset.xml
+++ b/tests/qemuxml2xmloutdata/memorybacking-unset.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/memtune-unlimited.xml b/tests/qemuxml2xmloutdata/memtune-unlimited.xml
index 1910edab411d81014d8f4daa991bdfeef96ee88c..24e5aadcdf80cc940701cc1ed8d79cbc03d9fe2b 100644 (file)
--- a/tests/qemuxml2xmloutdata/memtune-unlimited.xml
+++ b/tests/qemuxml2xmloutdata/memtune-unlimited.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/memtune.xml b/tests/qemuxml2xmloutdata/memtune.xml
index 55db8a2dafef87216f9fb9814a9ab90f27b3deaf..59de8b2c02fde8b0e0d04a3a871b097478109a95 100644 (file)
--- a/tests/qemuxml2xmloutdata/memtune.xml
+++ b/tests/qemuxml2xmloutdata/memtune.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/metadata-duplicate.xml b/tests/qemuxml2xmloutdata/metadata-duplicate.xml
index 2ac9c2aa540aa9f9fc6cfd46592ca3e378fb527e..8955445eb005114fc1be6d6ee6939e0ec231080d 100644 (file)
--- a/tests/qemuxml2xmloutdata/metadata-duplicate.xml
+++ b/tests/qemuxml2xmloutdata/metadata-duplicate.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/metadata.xml b/tests/qemuxml2xmloutdata/metadata.xml
index 2ac9c2aa540aa9f9fc6cfd46592ca3e378fb527e..8955445eb005114fc1be6d6ee6939e0ec231080d 100644 (file)
--- a/tests/qemuxml2xmloutdata/metadata.xml
+++ b/tests/qemuxml2xmloutdata/metadata.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/migrate.xml b/tests/qemuxml2xmloutdata/migrate.xml
index ab681aab9d160d9e9335900807b8d0725cd73c12..757791af10d40f984b7b4e4780ccd95837e45ab8 100644 (file)
--- a/tests/qemuxml2xmloutdata/migrate.xml
+++ b/tests/qemuxml2xmloutdata/migrate.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/minimal.xml b/tests/qemuxml2xmloutdata/minimal.xml
index 1a0cf56824b0cfc5709700e189834473d10f318a..aae7d84719cfec6ce9d31df9cd9a371fd3b67f3f 100644 (file)
--- a/tests/qemuxml2xmloutdata/minimal.xml
+++ b/tests/qemuxml2xmloutdata/minimal.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/misc-acpi.xml b/tests/qemuxml2xmloutdata/misc-acpi.xml
index 0dd1a3d78280ea8946760a836c68643bc22c576f..6114d43b13fe15ca7c8470d8df8b67189d76ed30 100644 (file)
--- a/tests/qemuxml2xmloutdata/misc-acpi.xml
+++ b/tests/qemuxml2xmloutdata/misc-acpi.xml
@@ -16,7 +16,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/misc-disable-s3.xml b/tests/qemuxml2xmloutdata/misc-disable-s3.xml
index 0c447fe5846118b82f016855efcd5c93ce0b4ff5..efdcc3bd3743b03eb559ff2a4e037046552851c1 100644 (file)
--- a/tests/qemuxml2xmloutdata/misc-disable-s3.xml
+++ b/tests/qemuxml2xmloutdata/misc-disable-s3.xml
@@ -16,7 +16,7 @@
     <suspend-to-mem enabled='no'/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/misc-disable-suspends.xml b/tests/qemuxml2xmloutdata/misc-disable-suspends.xml
index eac8ee9cd725a4ecf453cbdb5a633ca837ce638b..6e94800d6f749be578394f71f7fb8f8456ed9ed8 100644 (file)
--- a/tests/qemuxml2xmloutdata/misc-disable-suspends.xml
+++ b/tests/qemuxml2xmloutdata/misc-disable-suspends.xml
@@ -17,7 +17,7 @@
     <suspend-to-disk enabled='no'/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/misc-enable-s4.xml b/tests/qemuxml2xmloutdata/misc-enable-s4.xml
index a246b0b5cabe6ca669b3a9a65e7851182c380312..e9c5d5e63feea4b4c31247994650923656ff1c2d 100644 (file)
--- a/tests/qemuxml2xmloutdata/misc-enable-s4.xml
+++ b/tests/qemuxml2xmloutdata/misc-enable-s4.xml
@@ -16,7 +16,7 @@
     <suspend-to-disk enabled='yes'/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/misc-no-reboot.xml b/tests/qemuxml2xmloutdata/misc-no-reboot.xml
index 6e026b135637f79d42fdeed801bb23854400ece6..9f3a4d487a9ce296faa28dd4b15caf3e5da9ccaf 100644 (file)
--- a/tests/qemuxml2xmloutdata/misc-no-reboot.xml
+++ b/tests/qemuxml2xmloutdata/misc-no-reboot.xml
@@ -13,7 +13,7 @@
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/misc-uuid.xml b/tests/qemuxml2xmloutdata/misc-uuid.xml
index 0dd1a3d78280ea8946760a836c68643bc22c576f..6114d43b13fe15ca7c8470d8df8b67189d76ed30 100644 (file)
--- a/tests/qemuxml2xmloutdata/misc-uuid.xml
+++ b/tests/qemuxml2xmloutdata/misc-uuid.xml
@@ -16,7 +16,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/net-eth-hostip.xml b/tests/qemuxml2xmloutdata/net-eth-hostip.xml
index 4b104a72c281a5acd69c870bd29bab0941091f6a..3990dfbdf98b5d7a21f4b2c851e9d808c7ae5c39 100644 (file)
--- a/tests/qemuxml2xmloutdata/net-eth-hostip.xml
+++ b/tests/qemuxml2xmloutdata/net-eth-hostip.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/net-eth-ifname.xml b/tests/qemuxml2xmloutdata/net-eth-ifname.xml
index c36baa0ec399ab2f0b10800df1d3e65444cd1950..275f0c9b0c894758ceaad6c952d3b587b1a7a3c4 100644 (file)
--- a/tests/qemuxml2xmloutdata/net-eth-ifname.xml
+++ b/tests/qemuxml2xmloutdata/net-eth-ifname.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml b/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml
index cdff17993261bf821aa11d39fc70d5422c144e00..061d1b595403adf8fceb6b4106eee4b9b57aaa03 100644 (file)
--- a/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml
+++ b/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/net-eth.xml b/tests/qemuxml2xmloutdata/net-eth.xml
index 898bda633ab51fa0493776ad29ff1ca0b610afd8..8e84643c9876cb5195c748f7cdb96d1326beaa88 100644 (file)
--- a/tests/qemuxml2xmloutdata/net-eth.xml
+++ b/tests/qemuxml2xmloutdata/net-eth.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml b/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml
index d9ecf40cf0adc118b1b2bc1284526c3943017713..f6ddad49c0491436deff46c3a96572890c2536a8 100644 (file)
--- a/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml
+++ b/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml
@@ -12,7 +12,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml b/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml
index 3f057a8249429ed1b0a1cce34523c624f73ca7cd..324c75e990c1cf4709dd190833cfca69df21dc61 100644 (file)
--- a/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml
+++ b/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/net-hostdev.xml b/tests/qemuxml2xmloutdata/net-hostdev.xml
index bede4b034f37714de73e5f2f0faf421bbd482767..7403bff9a06b2cf1fb7a753873e794312d71426f 100644 (file)
--- a/tests/qemuxml2xmloutdata/net-hostdev.xml
+++ b/tests/qemuxml2xmloutdata/net-hostdev.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/net-many-models.xml b/tests/qemuxml2xmloutdata/net-many-models.xml
index 8fb3be920b314edae45813de4871582914640f3b..3f2a642574ed16db9e814cb417bb222102dc4c9f 100644 (file)
--- a/tests/qemuxml2xmloutdata/net-many-models.xml
+++ b/tests/qemuxml2xmloutdata/net-many-models.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0' model='none'/>
     <controller type='pci' index='0' model='pci-root'/>
     <interface type='user'>

diff --git a/tests/qemuxml2xmloutdata/net-midonet.xml b/tests/qemuxml2xmloutdata/net-midonet.xml
index 49fe8f6ec2eb6772c8ab88357fa894fc72598ce4..61e3ec8919b271afec792b677e4c10ad127b54ed 100644 (file)
--- a/tests/qemuxml2xmloutdata/net-midonet.xml
+++ b/tests/qemuxml2xmloutdata/net-midonet.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/net-openvswitch.xml b/tests/qemuxml2xmloutdata/net-openvswitch.xml
index 13efaca2cb2fa39df4378d3ad74d02ba063710e7..7b53846a08b5cc4c67a460a2417ee92c0d03f61a 100644 (file)
--- a/tests/qemuxml2xmloutdata/net-openvswitch.xml
+++ b/tests/qemuxml2xmloutdata/net-openvswitch.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/net-udp.xml b/tests/qemuxml2xmloutdata/net-udp.xml
index efd74cb36d6e22c93df83c3e057b386367ac29ab..fedb99f00145f98d41870f43add1b9cd77a05d4d 100644 (file)
--- a/tests/qemuxml2xmloutdata/net-udp.xml
+++ b/tests/qemuxml2xmloutdata/net-udp.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/net-user.xml b/tests/qemuxml2xmloutdata/net-user.xml
index 49902e2a9b6340b081f78c79013532a054c5d403..35283da4885c39ca9c66e3960c8bf51262f16fba 100644 (file)
--- a/tests/qemuxml2xmloutdata/net-user.xml
+++ b/tests/qemuxml2xmloutdata/net-user.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/net-vhostuser.xml b/tests/qemuxml2xmloutdata/net-vhostuser.xml
index 9655c21ede06fdf9bbdd38b70384f63e27a78c88..e0a5335896673da6c210866fed3983cbf0dc81b4 100644 (file)
--- a/tests/qemuxml2xmloutdata/net-vhostuser.xml
+++ b/tests/qemuxml2xmloutdata/net-vhostuser.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/net-virtio-device.xml b/tests/qemuxml2xmloutdata/net-virtio-device.xml
index f1238cde2be4c6a6ef90acb06c0bcef2fe4b8538..9caa28911668ac52882e61608ded62a71661da9b 100644 (file)
--- a/tests/qemuxml2xmloutdata/net-virtio-device.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-device.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml b/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
index e5cad4078b3c37a5c1d1924e1f63a21c7a34a51c..15958be87b1b3c9ec9f4e793b09c02e9e42d56d3 100644 (file)
--- a/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest7'/>

diff --git a/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml b/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
index fe8c5657ced0b109aae8cad20da75e12f6af5a34..d298204250491368dece2420a711f7c4083c7fcd 100644 (file)
--- a/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml b/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
index 753c2f247e28cc168dc545c010296f73e83b247b..fce6d083ae6f509ddc9f9d681dfed8f341b42a3b 100644 (file)
--- a/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/net-virtio.xml b/tests/qemuxml2xmloutdata/net-virtio.xml
index 309d4ea2ccea084bc2e75667bebb6d249619a92b..2ed622e923b28bea2a20f95297782932f5543fd3 100644 (file)
--- a/tests/qemuxml2xmloutdata/net-virtio.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/nographics-vga.xml b/tests/qemuxml2xmloutdata/nographics-vga.xml
index ab681aab9d160d9e9335900807b8d0725cd73c12..757791af10d40f984b7b4e4780ccd95837e45ab8 100644 (file)
--- a/tests/qemuxml2xmloutdata/nographics-vga.xml
+++ b/tests/qemuxml2xmloutdata/nographics-vga.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/nosharepages.xml b/tests/qemuxml2xmloutdata/nosharepages.xml
index 1acb86f4f2705a92a1b8b984825d92eaadbb8e02..dd5d24eaee693a711cf252d615b00edefd19f39f 100644 (file)
--- a/tests/qemuxml2xmloutdata/nosharepages.xml
+++ b/tests/qemuxml2xmloutdata/nosharepages.xml
@@ -16,7 +16,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
index 6e3aa331c526fffe5494614c8d2ebe2f013d8719..133177b679cdb75724777144dcdfb2bdbc73ec80 100644 (file)
--- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
+++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
index 0be69f5b0237d67a809cb6bb64f8b330847e4e5d..dc14ecd1398a2efa4e2f8bd118ca2c25c16ab0ec 100644 (file)
--- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
+++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
index 04d9a3ee5e19c6dc8a9b8807e90e014f6c2519ab..76d7c3b83567466e2bca5c156da61ac77ca5ae6d 100644 (file)
--- a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
+++ b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
index 3dae444172fb68f2f529383332106340039e73d7..523962117eda1623edc5f6c5a7a3edd38b042e68 100644 (file)
--- a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
+++ b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
@@ -16,7 +16,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/panic-double.xml b/tests/qemuxml2xmloutdata/panic-double.xml
index 45e9b72012e1e6a30d0ce721deec53608c6fa8be..b3d0f79ee39faa3646919afc2e74b473f2e6fc86 100644 (file)
--- a/tests/qemuxml2xmloutdata/panic-double.xml
+++ b/tests/qemuxml2xmloutdata/panic-double.xml
@@ -16,7 +16,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/panic-isa.xml b/tests/qemuxml2xmloutdata/panic-isa.xml
index 8f4f330d54cbec5290cc24db0b50f89b1c2cfbd4..ef75c59046701bb7f56ca1b30bb03dbba934104a 100644 (file)
--- a/tests/qemuxml2xmloutdata/panic-isa.xml
+++ b/tests/qemuxml2xmloutdata/panic-isa.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/panic-no-address.xml b/tests/qemuxml2xmloutdata/panic-no-address.xml
index b05d2209ac968b1c2c7a244cdcf6bd0c711d2f3a..129e66cd99124d5975fa9276d86098edb88a4bb8 100644 (file)
--- a/tests/qemuxml2xmloutdata/panic-no-address.xml
+++ b/tests/qemuxml2xmloutdata/panic-no-address.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/panic.xml b/tests/qemuxml2xmloutdata/panic.xml
index 8f4f330d54cbec5290cc24db0b50f89b1c2cfbd4..ef75c59046701bb7f56ca1b30bb03dbba934104a 100644 (file)
--- a/tests/qemuxml2xmloutdata/panic.xml
+++ b/tests/qemuxml2xmloutdata/panic.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/parallel-tcp.xml b/tests/qemuxml2xmloutdata/parallel-tcp.xml
index 96887cb040486b44b8ae45fd449e39f4a112e626..4cad78f847ffdbc5664864e08bc034bc02013a5d 100644 (file)
--- a/tests/qemuxml2xmloutdata/parallel-tcp.xml
+++ b/tests/qemuxml2xmloutdata/parallel-tcp.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/pci-rom.xml b/tests/qemuxml2xmloutdata/pci-rom.xml
index 982231fefe0739eea83807fa1d6cee5c202c2932..62945054d4c4a9f32dd372de5c684e029d993412 100644 (file)
--- a/tests/qemuxml2xmloutdata/pci-rom.xml
+++ b/tests/qemuxml2xmloutdata/pci-rom.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest2'/>

diff --git a/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml b/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml
index 5308d4d253d4a6af8f31cb774e9f7c45dd1540c8..9fe7fd5cc1c4049b6d0411fa8a2673c5fe2e39c5 100644 (file)
--- a/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml
+++ b/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/pmu-feature-off.xml b/tests/qemuxml2xmloutdata/pmu-feature-off.xml
index f14a5b7a76272a5afcd4be64b8be0d2005ec41a0..93980146942eabe66c3325460259d5cbbdf9b199 100644 (file)
--- a/tests/qemuxml2xmloutdata/pmu-feature-off.xml
+++ b/tests/qemuxml2xmloutdata/pmu-feature-off.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/pmu-feature.xml b/tests/qemuxml2xmloutdata/pmu-feature.xml
index 71734e7b118db26797fbd1cbfb278b54184752b4..7fee1ae0acce4fcc05648e7c873ed6f4742f8153 100644 (file)
--- a/tests/qemuxml2xmloutdata/pmu-feature.xml
+++ b/tests/qemuxml2xmloutdata/pmu-feature.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml b/tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml
index 2f48bb588492ccfa02bd2386f162dfa9032cdda3..b8f23b070b98d52138ab027cd31686ebddb481c9 100644 (file)
--- a/tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml
+++ b/tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml b/tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml
index 29e2b2c74cf911ebcadb9f267efa6d134f73ef7b..5d30fa0f10bdfb9af6eb78ff213c3a9076c33f46 100644 (file)
--- a/tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml
+++ b/tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml
@@ -18,7 +18,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/qemu-ns-no-env.xml b/tests/qemuxml2xmloutdata/qemu-ns-no-env.xml
index 46455c0a7befea5db22d0c59f9481063035e5c8c..f4e95d92c0be0cd75cc6f3242575fb4605df2a44 100644 (file)
--- a/tests/qemuxml2xmloutdata/qemu-ns-no-env.xml
+++ b/tests/qemuxml2xmloutdata/qemu-ns-no-env.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml b/tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml
index 29b608af0ab78431857c9cb75677dd948e1a0d26..5a5e2ffd9d3a272e2dbabb935d565e47ff8d1d63 100644 (file)
--- a/tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml
+++ b/tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml
@@ -14,7 +14,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml b/tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml
index 49ed16774fce006a27908cdae8110854b886a439..a2383d57bf2fa016b5d38f34a1ce87b14706e6da 100644 (file)
--- a/tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml
+++ b/tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml
@@ -14,7 +14,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/restore-v2.xml b/tests/qemuxml2xmloutdata/restore-v2.xml
index ab681aab9d160d9e9335900807b8d0725cd73c12..757791af10d40f984b7b4e4780ccd95837e45ab8 100644 (file)
--- a/tests/qemuxml2xmloutdata/restore-v2.xml
+++ b/tests/qemuxml2xmloutdata/restore-v2.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/seclabel-dac-none.xml b/tests/qemuxml2xmloutdata/seclabel-dac-none.xml
index 04418be906c075a94838952d38757d809c1e3130..a82cdf167f3b55b3a609cd84e3997e7808f6f4b0 100644 (file)
--- a/tests/qemuxml2xmloutdata/seclabel-dac-none.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dac-none.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml b/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
index 46b6b210b53f751d4b26aa7094326fbb0d37f9fd..eaec8020541cd72a4a3b7a380bfd525485a1b71b 100644 (file)
--- a/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'>

diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml
index 7163015192f3f03cda54363e913dabd16aebffd1..db8d3f3bf96833815c53e2d1cbd3bc439b8a2778 100644 (file)
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml
index 7163015192f3f03cda54363e913dabd16aebffd1..db8d3f3bf96833815c53e2d1cbd3bc439b8a2778 100644 (file)
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
index 067889262c7a73af52d3d0be0a0e376a9bc91c30..ce7b409947664bf61ccb584d9b05d9859a4c4a7c 100644 (file)
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml
index 9e21c054b011143979d9d122560a2b19346bc485..aadcf5a516b5b276c1844be35aafee18e606560e 100644 (file)
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'>

diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml
index 067889262c7a73af52d3d0be0a0e376a9bc91c30..ce7b409947664bf61ccb584d9b05d9859a4c4a7c 100644 (file)
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/seclabel-none.xml b/tests/qemuxml2xmloutdata/seclabel-none.xml
index 067889262c7a73af52d3d0be0a0e376a9bc91c30..ce7b409947664bf61ccb584d9b05d9859a4c4a7c 100644 (file)
--- a/tests/qemuxml2xmloutdata/seclabel-none.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-none.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml
index 7c448675e21a3ec9f36e6337956e65232cd7a95b..48ffcded63e0b3a4da7d61541a321e916f5ac556 100644 (file)
--- a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'>

diff --git a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml
index e705b5452ca8712e796d702bab052361cd897216..d8d93fe0161acf90a45ddd68b6181435635d2c66 100644 (file)
--- a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/seclabel-static.xml b/tests/qemuxml2xmloutdata/seclabel-static.xml
index 2197104d57ff927975ec327ab6ffe37e1eab1fa6..b633a9f829478ca0b660f5fac96dd31442da0199 100644 (file)
--- a/tests/qemuxml2xmloutdata/seclabel-static.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-static.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/serial-dev.xml b/tests/qemuxml2xmloutdata/serial-dev.xml
index 7c52cd479c5aee55632bc1e0c0330ff3c17eb57f..18317c590a28976aed0e4ae18348857af11d54fd 100644 (file)
--- a/tests/qemuxml2xmloutdata/serial-dev.xml
+++ b/tests/qemuxml2xmloutdata/serial-dev.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/serial-file.xml b/tests/qemuxml2xmloutdata/serial-file.xml
index 69bd55e5311e7dda56b6f5a7eebaade751ed432c..1860db8a27683451b6720465301fc5dee77d3bf0 100644 (file)
--- a/tests/qemuxml2xmloutdata/serial-file.xml
+++ b/tests/qemuxml2xmloutdata/serial-file.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/serial-many.xml b/tests/qemuxml2xmloutdata/serial-many.xml
index 6f8bccd40d36ef558d7614f42602f54fe5aad99e..3d72053535f71c1a83da991cca5bc6e97643a055 100644 (file)
--- a/tests/qemuxml2xmloutdata/serial-many.xml
+++ b/tests/qemuxml2xmloutdata/serial-many.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/serial-pty.xml b/tests/qemuxml2xmloutdata/serial-pty.xml
index 21a10ff73151176c17d839e2d26d227ca2637cb0..7d8266cbdabd77c2d71b66dab8964dfff728e195 100644 (file)
--- a/tests/qemuxml2xmloutdata/serial-pty.xml
+++ b/tests/qemuxml2xmloutdata/serial-pty.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml b/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml
index 560f4d2b77b480dd5bec6b75bec261e1f67cc05c..5ab1ecae7feb53019f0e495bb6b3c0b5e1aed45c 100644 (file)
--- a/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml
+++ b/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/serial-spiceport.xml b/tests/qemuxml2xmloutdata/serial-spiceport.xml
index 287f3817e1c2fa408e4ac54f9810d3d798ba7afe..5fca7b19c572bd14c3bdbb267ca3ab39c516c0ee 100644 (file)
--- a/tests/qemuxml2xmloutdata/serial-spiceport.xml
+++ b/tests/qemuxml2xmloutdata/serial-spiceport.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/serial-target-port-auto.xml b/tests/qemuxml2xmloutdata/serial-target-port-auto.xml
index cc10a55bcfd9b39b62880cd83154d76c8bb38bcb..9aae2ac0445dfdd9445c2938f2d8994b48037a73 100644 (file)
--- a/tests/qemuxml2xmloutdata/serial-target-port-auto.xml
+++ b/tests/qemuxml2xmloutdata/serial-target-port-auto.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/serial-tcp-telnet.xml b/tests/qemuxml2xmloutdata/serial-tcp-telnet.xml
index 4cf3d4ed242a0436958a5436f4689b5550f0435a..a2110221f8c61356ee9c312c533c1ecf997d2669 100644 (file)
--- a/tests/qemuxml2xmloutdata/serial-tcp-telnet.xml
+++ b/tests/qemuxml2xmloutdata/serial-tcp-telnet.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml
index 44a5be35b4f032e3b3389e94aeec18a673f3a7e6..48233383651d7f43ab2e3cbca2c985e942761f39 100644 (file)
--- a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml
+++ b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/serial-tcp.xml b/tests/qemuxml2xmloutdata/serial-tcp.xml
index 499147b5097329d3b0fc862c74934ef9392bb827..a4f754de3ae0b8f9ef6d3aebe8e7144c90d47372 100644 (file)
--- a/tests/qemuxml2xmloutdata/serial-tcp.xml
+++ b/tests/qemuxml2xmloutdata/serial-tcp.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/serial-udp.xml b/tests/qemuxml2xmloutdata/serial-udp.xml
index 8ee793b54f84c7ec09db63164ab1d814bafcaeb4..1bd7c29fe216c447cdc209a9a486177e4bf0a702 100644 (file)
--- a/tests/qemuxml2xmloutdata/serial-udp.xml
+++ b/tests/qemuxml2xmloutdata/serial-udp.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/serial-unix.xml b/tests/qemuxml2xmloutdata/serial-unix.xml
index 8dae21fb3e90a60c2a23991d11441b9fdd1f97a1..850a1d6766f705c6b9502d83de218944fb25752f 100644 (file)
--- a/tests/qemuxml2xmloutdata/serial-unix.xml
+++ b/tests/qemuxml2xmloutdata/serial-unix.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/serial-vc.xml b/tests/qemuxml2xmloutdata/serial-vc.xml
index 09f40a976abcfc76b020054849f01023685e5908..c7826f3284687abe92206bf0f74e5af4c79ff55a 100644 (file)
--- a/tests/qemuxml2xmloutdata/serial-vc.xml
+++ b/tests/qemuxml2xmloutdata/serial-vc.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml b/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml
index b22f636220381a51c9a5bda8ee072491bdd2973f..c5dd0f4598ff4332c3ae8b0b479644b3f7238387 100644 (file)
--- a/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml
+++ b/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/shmem.xml b/tests/qemuxml2xmloutdata/shmem.xml
index 4713964a329725239247c7da388a82452bafc77d..3145b3fc216934de30b62ad52a6d7c2aa2dc249c 100644 (file)
--- a/tests/qemuxml2xmloutdata/shmem.xml
+++ b/tests/qemuxml2xmloutdata/shmem.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/smartcard-controller.xml b/tests/qemuxml2xmloutdata/smartcard-controller.xml
index dc7365b0b6075b2bc11563170b7aff914827f1a7..b996c5b3db9282fc552dd045689ac44c8424bfcf 100644 (file)
--- a/tests/qemuxml2xmloutdata/smartcard-controller.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-controller.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='ccid' index='0'/>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>

diff --git a/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml b/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml
index 55d54a4355108cd58de68474e465cb3122e4ea82..6d22110698834f8d6cf90a43e751bb5c932e1b70 100644 (file)
--- a/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/smartcard-host-certificates.xml b/tests/qemuxml2xmloutdata/smartcard-host-certificates.xml
index e0835f6c05474fc96a75a8e11aa80f56d7fe34a0..d0e545da617fe343326044fb948ad6bd6f40d443 100644 (file)
--- a/tests/qemuxml2xmloutdata/smartcard-host-certificates.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-host-certificates.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/smartcard-host.xml b/tests/qemuxml2xmloutdata/smartcard-host.xml
index abb2c4b6ec48514f8e9e676419ebc2b7c5dc80c2..acd5675ff48ded33295d206e1e54407425a23963 100644 (file)
--- a/tests/qemuxml2xmloutdata/smartcard-host.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-host.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml b/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml
index 38755e2d7b38207f1446f4f65600f548173da580..0de8c9d27076b2c7eaff249146370f342fb45fe2 100644 (file)
--- a/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml b/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml
index 2232daa3595ee6fb7568058236a6ebfa05d6e994..c02f1e2526a3035c0477c053aa39aa307bdd64f7 100644 (file)
--- a/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml b/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
index d3dd152aeddac641c3e079a0f947e0e4d615c8e1..62dcf0d176e3e11061bc4757dc202349af6a8928 100644 (file)
--- a/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
+++ b/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
@@ -44,7 +44,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/smbios.xml b/tests/qemuxml2xmloutdata/smbios.xml
index 931c291d21fa0c23c65a1a2d5fe9356ca822ff20..5385556b39a4e2028fb000966151858464d9ae00 100644 (file)
--- a/tests/qemuxml2xmloutdata/smbios.xml
+++ b/tests/qemuxml2xmloutdata/smbios.xml
@@ -49,7 +49,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/smp.xml b/tests/qemuxml2xmloutdata/smp.xml
index dedcc1b4a93c5b76d3be70b19cb3629377c0ecb0..d3712cb7dfe2624c097dc39ee89381209aaa9f9f 100644 (file)
--- a/tests/qemuxml2xmloutdata/smp.xml
+++ b/tests/qemuxml2xmloutdata/smp.xml
@@ -16,7 +16,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/sound-device.xml b/tests/qemuxml2xmloutdata/sound-device.xml
index cbf4d179182a51d386fce7b4257ced8b04d4d521..62d658b9cd070edc5d5c5f370aefa869ca56655a 100644 (file)
--- a/tests/qemuxml2xmloutdata/sound-device.xml
+++ b/tests/qemuxml2xmloutdata/sound-device.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/sound.xml b/tests/qemuxml2xmloutdata/sound.xml
index 6448c5e25498fd7252d8a4f20776a558e340ea5a..d1d208322b14b2e38155d64019ac96b4b21440a0 100644 (file)
--- a/tests/qemuxml2xmloutdata/sound.xml
+++ b/tests/qemuxml2xmloutdata/sound.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/usb-controller.xml b/tests/qemuxml2xmloutdata/usb-controller.xml
index e2683b057ac09560dd4a7a3c9f2fc7945b1d1e46..2041803aad5db2e9be77878ee76c55ea5231da64 100644 (file)
--- a/tests/qemuxml2xmloutdata/usb-controller.xml
+++ b/tests/qemuxml2xmloutdata/usb-controller.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml b/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml
index 23d3dedc0ed366b4cb13ff662394de2fef985125..da6705fe549346a853acbc890bd7fedc0f39bd58 100644 (file)
--- a/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml
+++ b/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0' model='ich9-ehci1'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/usb-none.xml b/tests/qemuxml2xmloutdata/usb-none.xml
index fdc558428caf494c40fc8310463767187c3fc880..4ccaf8d1a0e6dfb6b47f549badba2fc1e3a62553 100644 (file)
--- a/tests/qemuxml2xmloutdata/usb-none.xml
+++ b/tests/qemuxml2xmloutdata/usb-none.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0' model='none'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>

diff --git a/tests/qemuxml2xmloutdata/usb-piix3-controller.xml b/tests/qemuxml2xmloutdata/usb-piix3-controller.xml
index 2ed1fd0f217f43c8acde86eb67dec37a6a50c06b..903cf80e70b88fc85f9c51f8d1a92b93e31b1ee0 100644 (file)
--- a/tests/qemuxml2xmloutdata/usb-piix3-controller.xml
+++ b/tests/qemuxml2xmloutdata/usb-piix3-controller.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/usb-port-missing.xml b/tests/qemuxml2xmloutdata/usb-port-missing.xml
index 5f907b7345e09a6ee042e89612757a344a390c09..74f88e6ac1ea876dddb7a8a9e9392615fc8f842e 100644 (file)
--- a/tests/qemuxml2xmloutdata/usb-port-missing.xml
+++ b/tests/qemuxml2xmloutdata/usb-port-missing.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/usb-redir-filter-version.xml b/tests/qemuxml2xmloutdata/usb-redir-filter-version.xml
index d1d966bcf56122523180f0bf8768a621afd2b307..fb2bfd7ad798ec94f57903e2357a6283839421ab 100644 (file)
--- a/tests/qemuxml2xmloutdata/usb-redir-filter-version.xml
+++ b/tests/qemuxml2xmloutdata/usb-redir-filter-version.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/usb-redir-filter.xml b/tests/qemuxml2xmloutdata/usb-redir-filter.xml
index d78e7e5d414ff1b339273fc67a0e03d280e7b72e..56cfbac2bc3507c632d82400f7d468aefa16b762 100644 (file)
--- a/tests/qemuxml2xmloutdata/usb-redir-filter.xml
+++ b/tests/qemuxml2xmloutdata/usb-redir-filter.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0' model='ich9-ehci1'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x7'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/usb-redir.xml b/tests/qemuxml2xmloutdata/usb-redir.xml
index 18dccb18c931e07fd539b0885ed3f6dc64cefcc5..45c44721f41f9bf574ec75244a1d684de3f2e4ad 100644 (file)
--- a/tests/qemuxml2xmloutdata/usb-redir.xml
+++ b/tests/qemuxml2xmloutdata/usb-redir.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0' model='ich9-ehci1'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x7'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/video-none-device.xml b/tests/qemuxml2xmloutdata/video-none-device.xml
index 82615f512521da074628ef0e6daed844ce6fe0a6..06d088a94fe3bc964fb599535b2c9d253c62abc8 100644 (file)
--- a/tests/qemuxml2xmloutdata/video-none-device.xml
+++ b/tests/qemuxml2xmloutdata/video-none-device.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/video-qxl-heads.xml b/tests/qemuxml2xmloutdata/video-qxl-heads.xml
index 69c625bddc5dfea8b8607d5379d5e5245d4393cc..0dd35c184be82c12a60933c25280b5b4dfb595ab 100644 (file)
--- a/tests/qemuxml2xmloutdata/video-qxl-heads.xml
+++ b/tests/qemuxml2xmloutdata/video-qxl-heads.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/video-qxl-noheads.xml b/tests/qemuxml2xmloutdata/video-qxl-noheads.xml
index 6ba2817002767ef4351cf9455f3cd04118e0e86e..293ffe4743f0f94015157d8cf34692987c259802 100644 (file)
--- a/tests/qemuxml2xmloutdata/video-qxl-noheads.xml
+++ b/tests/qemuxml2xmloutdata/video-qxl-noheads.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/video-qxl-resolution.xml b/tests/qemuxml2xmloutdata/video-qxl-resolution.xml
index 1bc415f3f864f2e6fc7f9f604aad47af7a001471..e693cbce473dde4943f8f4ff5c4a44ebf34adff9 100644 (file)
--- a/tests/qemuxml2xmloutdata/video-qxl-resolution.xml
+++ b/tests/qemuxml2xmloutdata/video-qxl-resolution.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-device.xml b/tests/qemuxml2xmloutdata/video-virtio-gpu-device.xml
index 307d226cdabe752c932e1b808abbc1ac26540006..17d826ba69503e733e9d9835fd01703daf83aca2 100644 (file)
--- a/tests/qemuxml2xmloutdata/video-virtio-gpu-device.xml
+++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-device.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='none'/>
       <source file='/var/lib/libvirt/images/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.xml b/tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.xml
index da03dd5da84b8a29283bbcf604067e763fb219c2..4e91b6152f45931af1afe40e1da052b255c2d1b7 100644 (file)
--- a/tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.xml
+++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='none'/>
       <source file='/var/lib/libvirt/images/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.xml b/tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.xml
index 720d362230d52977779dea7c4ac19c70efa8551c..b570c535fd82ec950fcd44680d5568a0774dcb67 100644 (file)
--- a/tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.xml
+++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='none'/>
       <source file='/var/lib/libvirt/images/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.xml b/tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.xml
index d2e73302f38cfd6c33e6560adc42f32ab1d0d8e7..c63c4503850c5c2c55f1d10910d52b64ca11c50e 100644 (file)
--- a/tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.xml
+++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='none'/>
       <source file='/var/lib/libvirt/images/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/virtio-input-passthrough.xml b/tests/qemuxml2xmloutdata/virtio-input-passthrough.xml
index fa83881ea31b42b6541a14f4d0f31331977e985b..9778dd3da9b32df4f1332295e0e5029098ca2e30 100644 (file)
--- a/tests/qemuxml2xmloutdata/virtio-input-passthrough.xml
+++ b/tests/qemuxml2xmloutdata/virtio-input-passthrough.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/virtio-input.xml b/tests/qemuxml2xmloutdata/virtio-input.xml
index d853c15d76c2916e59879dcf9c2e4d482c74ac6a..a08d1f741c7758621b9349bface8fc61ebcb344a 100644 (file)
--- a/tests/qemuxml2xmloutdata/virtio-input.xml
+++ b/tests/qemuxml2xmloutdata/virtio-input.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/virtio-rng-egd.xml b/tests/qemuxml2xmloutdata/virtio-rng-egd.xml
index 5a790f02464ed8aeca10c22c2b704eb730ebd914..d7302d0ad93ee13995ba56748fd29b00d4a1d857 100644 (file)
--- a/tests/qemuxml2xmloutdata/virtio-rng-egd.xml
+++ b/tests/qemuxml2xmloutdata/virtio-rng-egd.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/virtio-rng-random.xml b/tests/qemuxml2xmloutdata/virtio-rng-random.xml
index a06e489e72a4f167b671db8675413cc8c5b5c7a8..959d79e6ee966bfb9bde3046ce582f331b6865ed 100644 (file)
--- a/tests/qemuxml2xmloutdata/virtio-rng-random.xml
+++ b/tests/qemuxml2xmloutdata/virtio-rng-random.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>

diff --git a/tests/qemuxml2xmloutdata/vmcoreinfo.xml b/tests/qemuxml2xmloutdata/vmcoreinfo.xml
index 48b75d7d44d6a309163c075c91e8ed29c7f242d7..ec0f9559ddaeb71c0edef4603da69a8ba720aa43 100644 (file)
--- a/tests/qemuxml2xmloutdata/vmcoreinfo.xml
+++ b/tests/qemuxml2xmloutdata/vmcoreinfo.xml
@@ -16,7 +16,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/qemuxml2xmloutdata/watchdog.xml b/tests/qemuxml2xmloutdata/watchdog.xml
index 22247b09ebfdeb073f6c3063d178cfcc36b8cbe7..657ff5397f04c5c4ee558024420a2f861dc33620 100644 (file)
--- a/tests/qemuxml2xmloutdata/watchdog.xml
+++ b/tests/qemuxml2xmloutdata/watchdog.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 7b9e427463f7514a18a31886acc39f39e77dee0b..4cb128559a71f2822700c930b721e67e731ce206 100644 (file)
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -33,7 +33,7 @@ typedef enum {
 } QEMUBinType;
 
 static const char *QEMUBinList[] = {
-    "/usr/bin/qemu-system-i686",
+    "/usr/bin/qemu-system-i386",
     "/usr/bin/qemu-system-x86_64",
     "/usr/bin/qemu-system-aarch64",
     "/usr/bin/qemu-system-arm",

diff --git a/tests/virsh-define-dev-segfault b/tests/virsh-define-dev-segfault
index 06f548fda7742ec659d1c6e07e87bb5f47d21b57..a7533ba9b05f66fdb1ed352642ad90dc5baf32d9 100755 (executable)
--- a/tests/virsh-define-dev-segfault
+++ b/tests/virsh-define-dev-segfault
@@ -31,7 +31,7 @@ cat <<\EOF > D.xml || fail=1
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0'/>
     <serial type='pty'>
       <target port='0'/>