[libvirt] [PATCH] tests: Xen: use qemu-system-i386 for emulator

Jim Fehlig posted 1 patch 23 weeks ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/20180411192510.21283-1-jfehlig@suse.com
Test syntax-check passed
tests/sexpr2xmldata/sexpr2xml-fv-autoport.sexpr            | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml              | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr        | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml          | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr          | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml            | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr        | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml          | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr          | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml            | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr           | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml             | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr        | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml          | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr        | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml          | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr  | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml    | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml   | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr         | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml           | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr         | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml           | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr         | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml           | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr          | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml            | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr        | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml          | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr   | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml     | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr          | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml            | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr          | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml            | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr         | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml           | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr           | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml             | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr               | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-sound.xml                 | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr            | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml              | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr           | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml             | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr                 | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-utc.xml                   | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr                  | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv-v2.xml                    | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv.sexpr                     | 2 +-
tests/sexpr2xmldata/sexpr2xml-fv.xml                       | 2 +-
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr        | 2 +-
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml          | 2 +-
tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.sexpr      | 2 +-
tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml        | 2 +-
tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr               | 2 +-
tests/sexpr2xmldata/sexpr2xml-vif-rate.xml                 | 2 +-
tests/xmconfigdata/test-escape-paths.cfg                   | 2 +-
tests/xmconfigdata/test-escape-paths.xml                   | 2 +-
tests/xmconfigdata/test-fullvirt-default-feature.cfg       | 2 +-
tests/xmconfigdata/test-fullvirt-default-feature.xml       | 2 +-
tests/xmconfigdata/test-fullvirt-force-hpet.cfg            | 2 +-
tests/xmconfigdata/test-fullvirt-force-hpet.xml            | 2 +-
tests/xmconfigdata/test-fullvirt-force-nohpet.cfg          | 2 +-
tests/xmconfigdata/test-fullvirt-force-nohpet.xml          | 2 +-
tests/xmconfigdata/test-fullvirt-localtime.cfg             | 2 +-
tests/xmconfigdata/test-fullvirt-localtime.xml             | 2 +-
tests/xmconfigdata/test-fullvirt-net-netfront.cfg          | 2 +-
tests/xmconfigdata/test-fullvirt-net-netfront.xml          | 2 +-
tests/xmconfigdata/test-fullvirt-new-cdrom.cfg             | 2 +-
tests/xmconfigdata/test-fullvirt-new-cdrom.xml             | 2 +-
tests/xmconfigdata/test-fullvirt-nohap.cfg                 | 2 +-
tests/xmconfigdata/test-fullvirt-nohap.xml                 | 2 +-
tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg          | 2 +-
tests/xmconfigdata/test-fullvirt-parallel-tcp.xml          | 2 +-
tests/xmconfigdata/test-fullvirt-serial-file.cfg           | 2 +-
tests/xmconfigdata/test-fullvirt-serial-file.xml           | 2 +-
tests/xmconfigdata/test-fullvirt-serial-null.cfg           | 2 +-
tests/xmconfigdata/test-fullvirt-serial-null.xml           | 2 +-
tests/xmconfigdata/test-fullvirt-serial-pipe.cfg           | 2 +-
tests/xmconfigdata/test-fullvirt-serial-pipe.xml           | 2 +-
tests/xmconfigdata/test-fullvirt-serial-pty.cfg            | 2 +-
tests/xmconfigdata/test-fullvirt-serial-pty.xml            | 2 +-
tests/xmconfigdata/test-fullvirt-serial-stdio.cfg          | 2 +-
tests/xmconfigdata/test-fullvirt-serial-stdio.xml          | 2 +-
tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg     | 2 +-
tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml     | 2 +-
tests/xmconfigdata/test-fullvirt-serial-tcp.cfg            | 2 +-
tests/xmconfigdata/test-fullvirt-serial-tcp.xml            | 2 +-
tests/xmconfigdata/test-fullvirt-serial-udp.cfg            | 2 +-
tests/xmconfigdata/test-fullvirt-serial-udp.xml            | 2 +-
tests/xmconfigdata/test-fullvirt-serial-unix.cfg           | 2 +-
tests/xmconfigdata/test-fullvirt-serial-unix.xml           | 2 +-
tests/xmconfigdata/test-fullvirt-sound.cfg                 | 2 +-
tests/xmconfigdata/test-fullvirt-sound.xml                 | 2 +-
tests/xmconfigdata/test-fullvirt-usbmouse.cfg              | 2 +-
tests/xmconfigdata/test-fullvirt-usbmouse.xml              | 2 +-
tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml      | 2 +-
tests/xmconfigdata/test-fullvirt-usbtablet.cfg             | 2 +-
tests/xmconfigdata/test-fullvirt-usbtablet.xml             | 2 +-
tests/xmconfigdata/test-fullvirt-utc.cfg                   | 2 +-
tests/xmconfigdata/test-fullvirt-utc.xml                   | 2 +-
tests/xmconfigdata/test-no-source-cdrom.cfg                | 2 +-
tests/xmconfigdata/test-no-source-cdrom.xml                | 2 +-
tests/xmconfigdata/test-pci-devs.cfg                       | 2 +-
tests/xmconfigdata/test-pci-devs.xml                       | 2 +-
107 files changed, 107 insertions(+), 107 deletions(-)

[libvirt] [PATCH] tests: Xen: use qemu-system-i386 for emulator

Posted by Jim Fehlig 23 weeks ago
Many of the old xm and sexpr test files used qemu-dm as the emulator.
Modern Xen systems no longer use the old, forked qemu-dm, instead
preferring the distro provided qemu or an "upstream" qemu that is
built when the Xen tools are built. This qemu is typically installed
in /usr/lib/xen/bin/qemu-system-i386.

The libxl test files already use /usr/lib/xen/bin/qemu-system-i386.
For consistency, change the old test files to use the same emulator

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
---

These config files can serve as examples too, so best not to
encourage use of outdated/deprecated config.

 tests/sexpr2xmldata/sexpr2xml-fv-autoport.sexpr            | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml              | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr        | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml          | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr          | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml            | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr        | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml          | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr          | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml            | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr           | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml             | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr        | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml          | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr        | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml          | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr  | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml    | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml   | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr         | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml           | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr         | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml           | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr         | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml           | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr          | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml            | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr        | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml          | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr   | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml     | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr          | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml            | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr          | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml            | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr         | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml           | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr           | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml             | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr               | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-sound.xml                 | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr            | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml              | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr           | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml             | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr                 | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-utc.xml                   | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr                  | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv-v2.xml                    | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv.sexpr                     | 2 +-
 tests/sexpr2xmldata/sexpr2xml-fv.xml                       | 2 +-
 tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr        | 2 +-
 tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml          | 2 +-
 tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.sexpr      | 2 +-
 tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml        | 2 +-
 tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr               | 2 +-
 tests/sexpr2xmldata/sexpr2xml-vif-rate.xml                 | 2 +-
 tests/xmconfigdata/test-escape-paths.cfg                   | 2 +-
 tests/xmconfigdata/test-escape-paths.xml                   | 2 +-
 tests/xmconfigdata/test-fullvirt-default-feature.cfg       | 2 +-
 tests/xmconfigdata/test-fullvirt-default-feature.xml       | 2 +-
 tests/xmconfigdata/test-fullvirt-force-hpet.cfg            | 2 +-
 tests/xmconfigdata/test-fullvirt-force-hpet.xml            | 2 +-
 tests/xmconfigdata/test-fullvirt-force-nohpet.cfg          | 2 +-
 tests/xmconfigdata/test-fullvirt-force-nohpet.xml          | 2 +-
 tests/xmconfigdata/test-fullvirt-localtime.cfg             | 2 +-
 tests/xmconfigdata/test-fullvirt-localtime.xml             | 2 +-
 tests/xmconfigdata/test-fullvirt-net-netfront.cfg          | 2 +-
 tests/xmconfigdata/test-fullvirt-net-netfront.xml          | 2 +-
 tests/xmconfigdata/test-fullvirt-new-cdrom.cfg             | 2 +-
 tests/xmconfigdata/test-fullvirt-new-cdrom.xml             | 2 +-
 tests/xmconfigdata/test-fullvirt-nohap.cfg                 | 2 +-
 tests/xmconfigdata/test-fullvirt-nohap.xml                 | 2 +-
 tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg          | 2 +-
 tests/xmconfigdata/test-fullvirt-parallel-tcp.xml          | 2 +-
 tests/xmconfigdata/test-fullvirt-serial-file.cfg           | 2 +-
 tests/xmconfigdata/test-fullvirt-serial-file.xml           | 2 +-
 tests/xmconfigdata/test-fullvirt-serial-null.cfg           | 2 +-
 tests/xmconfigdata/test-fullvirt-serial-null.xml           | 2 +-
 tests/xmconfigdata/test-fullvirt-serial-pipe.cfg           | 2 +-
 tests/xmconfigdata/test-fullvirt-serial-pipe.xml           | 2 +-
 tests/xmconfigdata/test-fullvirt-serial-pty.cfg            | 2 +-
 tests/xmconfigdata/test-fullvirt-serial-pty.xml            | 2 +-
 tests/xmconfigdata/test-fullvirt-serial-stdio.cfg          | 2 +-
 tests/xmconfigdata/test-fullvirt-serial-stdio.xml          | 2 +-
 tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg     | 2 +-
 tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml     | 2 +-
 tests/xmconfigdata/test-fullvirt-serial-tcp.cfg            | 2 +-
 tests/xmconfigdata/test-fullvirt-serial-tcp.xml            | 2 +-
 tests/xmconfigdata/test-fullvirt-serial-udp.cfg            | 2 +-
 tests/xmconfigdata/test-fullvirt-serial-udp.xml            | 2 +-
 tests/xmconfigdata/test-fullvirt-serial-unix.cfg           | 2 +-
 tests/xmconfigdata/test-fullvirt-serial-unix.xml           | 2 +-
 tests/xmconfigdata/test-fullvirt-sound.cfg                 | 2 +-
 tests/xmconfigdata/test-fullvirt-sound.xml                 | 2 +-
 tests/xmconfigdata/test-fullvirt-usbmouse.cfg              | 2 +-
 tests/xmconfigdata/test-fullvirt-usbmouse.xml              | 2 +-
 tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml      | 2 +-
 tests/xmconfigdata/test-fullvirt-usbtablet.cfg             | 2 +-
 tests/xmconfigdata/test-fullvirt-usbtablet.xml             | 2 +-
 tests/xmconfigdata/test-fullvirt-utc.cfg                   | 2 +-
 tests/xmconfigdata/test-fullvirt-utc.xml                   | 2 +-
 tests/xmconfigdata/test-no-source-cdrom.cfg                | 2 +-
 tests/xmconfigdata/test-no-source-cdrom.xml                | 2 +-
 tests/xmconfigdata/test-pci-devs.cfg                       | 2 +-
 tests/xmconfigdata/test-pci-devs.xml                       | 2 +-
 107 files changed, 107 insertions(+), 107 deletions(-)

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.sexpr
index a18418a17..cdbbaedee 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.sexpr
@@ -23,7 +23,7 @@
         (hvm
             (kernel /usr/lib/xen/boot/hvmloader)
             (boot d)
-            (device_model /usr/lib/xen/bin/qemu-dm)
+            (device_model /usr/lib/xen/bin/qemu-system-i386)
             (keymap en-us)
             (localtime 1)
             (pae 1)
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
index 8eaacc86d..cf6683fee 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
@@ -17,7 +17,7 @@
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='phy' type='raw'/>
       <source dev='/iscsi/winxp'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr
index 777f7e08b..1372025df 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr
@@ -2,7 +2,7 @@
 (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (loader /usr/lib/xen/boot/hvmloader)(kernel '')\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(boot d)(cdrom '/root/boot.iso')\
+(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot d)(cdrom '/root/boot.iso')\
 (acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'hda')\
 (uname 'file:/root/foo.img')(mode 'w')))\
 (device (vbd (dev 'hdc:cdrom')\
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
index 8ed2261fc..dd5b46a6a 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='file' type='raw'/>
       <source file='/root/foo.img'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr
index 04cd2aebf..8f31abf18 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr
@@ -3,7 +3,7 @@
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(parallel none)(serial none)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(hpet 1)(vnc 1)))\
+(device_model '/usr/lib/xen/bin/qemu-system-i386')(hpet 1)(vnc 1)))\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vbd (dev 'hdc:cdrom')\
 (uname 'file:/root/boot.iso')(mode 'r')))\
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
index 5e176bf91..4c120674b 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='file' type='raw'/>
       <source file='/root/foo.img'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr
index bcb092650..7fee66693 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr
@@ -3,7 +3,7 @@
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(parallel none)(serial none)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(hpet 0)(vnc 1)))\
+(device_model '/usr/lib/xen/bin/qemu-system-i386')(hpet 0)(vnc 1)))\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vbd (dev 'hdc:cdrom')\
 (uname 'file:/root/boot.iso')(mode 'r')))\
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
index 826301182..5652e9a69 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='file' type='raw'/>
       <source file='/root/foo.img'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr
index 549b2800c..8bc6cfacf 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr
@@ -23,7 +23,7 @@
         (hvm
             (kernel /usr/lib/xen/boot/hvmloader)
             (boot c)
-            (device_model /usr/lib/xen/bin/qemu-dm)
+            (device_model /usr/lib/xen/bin/qemu-system-i386)
             (keymap en-us)
             (localtime 0)
             (pae 1)
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml b/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml
index 4f2a39b80..659dcfd8a 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <interface type='ethernet'>
       <target dev='vif1.0'/>
       <mac address='00:16:3e:3b:b9:d7'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr
index 5616d19e3..6673aef55 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr
@@ -2,7 +2,7 @@
 (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\
+(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
 (acpi 1)(vnc 1)(keymap ja)(localtime 1)))\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
index 2d390b52a..d985afbf1 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='file' type='raw'/>
       <source file='/root/foo.img'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr
index b0a344cb4..3516e72a0 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr
@@ -2,7 +2,7 @@
 (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\
+(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
 (acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\
 (uname 'file:/root/foo.img')(mode 'w')))\
 (device (vbd (dev 'hdc:cdrom')\
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
index 5edf0ce26..c15fe80a1 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='file' type='raw'/>
       <source file='/root/foo.img'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr
index 8d017263d..662845291 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr
@@ -3,7 +3,7 @@
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(parallel tcp:localhost:9999)\
-(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(serial none)(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
 (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
index eccab787b..2c4fd687a 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='file' type='raw'/>
       <source file='/root/foo.img'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr
index 8f5651813..a8d08340a 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr
@@ -3,7 +3,7 @@
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
-(serial (/dev/ttyS0 /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')\
+(serial (/dev/ttyS0 /dev/ttyS1))(device_model '/usr/lib/xen/bin/qemu-system-i386')\
 (vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
 (mode 'w')))\
 (device (vbd (dev 'hdc:cdrom')\
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
index 79e9e69c3..d72e503f8 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='file' type='raw'/>
       <source file='/root/foo.img'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr
index f0b992526..d9e7336ae 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr
@@ -3,7 +3,7 @@
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(parallel none)\
-(serial (none /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(serial (none /dev/ttyS1))(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vbd (dev 'hdc:cdrom')\
 (uname 'file:/root/boot.iso')(mode 'r')))\
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
index 111db35b1..860d24e05 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='file' type='raw'/>
       <source file='/root/foo.img'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr
index 0eac5a436..b52a5e455 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr
@@ -3,7 +3,7 @@
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(parallel none)\
-(serial file:/tmp/serial.log)(device_model '/usr/lib64/xen/bin/qemu-dm')\
+(serial file:/tmp/serial.log)(device_model '/usr/lib/xen/bin/qemu-system-i386')\
 (vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
 (mode 'w')))\
 (device (vbd (dev 'hdc:cdrom')\
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
index 40d1c6e62..c56e5432c 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='file' type='raw'/>
       <source file='/root/foo.img'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr
index a00410cd5..caf8b4a87 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr
@@ -3,7 +3,7 @@
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(parallel none)(serial null)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
 (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
index 60d5d8e9e..0615bf4b3 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='file' type='raw'/>
       <source file='/root/foo.img'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr
index 2b3a6610a..be3e13cd7 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr
@@ -3,7 +3,7 @@
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(parallel none)\
-(serial pipe:/tmp/serial.pipe)(device_model '/usr/lib64/xen/bin/qemu-dm')\
+(serial pipe:/tmp/serial.pipe)(device_model '/usr/lib/xen/bin/qemu-system-i386')\
 (vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
 (mode 'w')))\
 (device (vbd (dev 'hdc:cdrom')\
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
index 55a4e9e0b..00518e62f 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='file' type='raw'/>
       <source file='/root/foo.img'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr
index 1029c1a25..3ac68630c 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr
@@ -3,7 +3,7 @@
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(parallel none)(serial pty)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vbd (dev 'hdc:cdrom')\
 (uname 'file:/root/boot.iso')(mode 'r')))\
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
index 78ddea603..e9d3c0e6a 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='file' type='raw'/>
       <source file='/root/foo.img'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr
index 05a9a1d91..e3eb554ea 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr
@@ -3,7 +3,7 @@
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(parallel none)(serial stdio)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
 (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
index 112830ac7..5cdcd25d9 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='file' type='raw'/>
       <source file='/root/foo.img'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr
index 0d80f8aca..8107efebb 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr
@@ -4,7 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(parallel none)\
 (serial telnet:localhost:9999,server,nowait)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
 (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
index ab2450469..8457f49f8 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='file' type='raw'/>
       <source file='/root/foo.img'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr
index 44f2bfe8d..32cb2ba07 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr
@@ -4,7 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(parallel none)\
 (serial tcp:localhost:9999,server,nowait)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
 (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
index b6afd9b31..973f8c1cd 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='file' type='raw'/>
       <source file='/root/foo.img'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr
index 2efedf2e5..3eea32995 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr
@@ -4,7 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(parallel none)\
 (serial udp:localhost:9998@localhost:9999)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
 (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
index cdc05bc52..2f14f17be 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='file' type='raw'/>
       <source file='/root/foo.img'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr
index 356677e2c..aff06a67f 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr
@@ -4,7 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(parallel none)\
 (serial unix:/tmp/serial.sock,server,nowait)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
 (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
index 0fa40e95d..c2f32144e 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='file' type='raw'/>
       <source file='/root/foo.img'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr
index d99e13a7e..6b0e82236 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr
@@ -2,7 +2,7 @@
 (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\
+(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
 (acpi 1)(vnc 1)(keymap ja)(soundhw 'all')))(device (vbd (dev 'ioemu:hda')\
 (uname 'file:/root/foo.img')(mode 'w')))\
 (device (vbd (dev 'hdc:cdrom')\
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
index def03321a..c2ea63f3b 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='file' type='raw'/>
       <source file='/root/foo.img'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr
index 50d67154e..9552b9b72 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr
@@ -2,7 +2,7 @@
 (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\
+(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
 (acpi 1)(vnc 1)(keymap ja)(soundhw 'sb16,es1370')))\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
index def03321a..c2ea63f3b 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='file' type='raw'/>
       <source file='/root/foo.img'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr
index 789082ef0..7a10c496b 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr
@@ -2,7 +2,7 @@
 (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\
+(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
 (acpi 1)(usbdevice mouse)(vnc 1)(keymap ja)))\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
index ded0aa853..1f919b8c0 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='file' type='raw'/>
       <source file='/root/foo.img'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr
index e2f77a167..3a2eec794 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr
@@ -2,7 +2,7 @@
 (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\
+(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
 (acpi 1)(usb 1)(usbdevice tablet)(vnc 1)(keymap ja)))\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
index 48ce7cebf..639517ee3 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='file' type='raw'/>
       <source file='/root/foo.img'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr
index 7bfbfaec6..09b7ecd8f 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr
@@ -2,7 +2,7 @@
 (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')\
+(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)(cdrom '/root/boot.iso')\
 (acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\
 (uname 'file:/root/foo.img')(mode 'w')))\
 (device (vbd (dev 'hdc:cdrom')\
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
index 1ae44a1d3..d281090c6 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='file' type='raw'/>
       <source file='/root/foo.img'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr
index 92e807c65..135b374c2 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr
@@ -2,7 +2,7 @@
 (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(acpi 1)(vnc 1)\
+(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)(acpi 1)(vnc 1)\
 (keymap ja)))(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')\
 (mode 'w')))(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')\
 (mode 'r')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
index 1ae44a1d3..d281090c6 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='file' type='raw'/>
       <source file='/root/foo.img'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv.sexpr
index dc4cbf59f..46794a5a1 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv.sexpr
@@ -2,7 +2,7 @@
 (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\
+(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
 (acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\
 (uname 'file:/root/foo.img')(mode 'w')))\
 (device (vbd (dev 'hdc:cdrom')\
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv.xml b/tests/sexpr2xmldata/sexpr2xml-fv.xml
index 1ae44a1d3..d281090c6 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='file' type='raw'/>
       <source file='/root/foo.img'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr
index f3e4901e4..bd75f6190 100644
--- a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr
@@ -25,7 +25,7 @@
             (kernel /usr/lib/xen/boot/hvmloader)
             (vnc 1)
             (vncunused 1)
-            (device_model /usr/lib/xen/bin/qemu-dm)
+            (device_model /usr/lib/xen/bin/qemu-system-i386)
             (pae 1)
             (apic 1)
             (acpi 1)
diff --git a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
index 975318294..a02104d0d 100644
--- a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
@@ -19,7 +19,7 @@
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='phy' type='raw'/>
       <source dev='/dev/sda8'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.sexpr b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.sexpr
index e01ecb984..b6511a96f 100644
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.sexpr
@@ -21,7 +21,7 @@
     (image
         (linux
             (kernel )
-            (device_model /usr/lib/xen/bin/qemu-dm)
+            (device_model /usr/lib/xen/bin/qemu-system-i386)
             (notes
                 (FEATURES
 'writable_page_tables|writable_descriptor_tables|auto_translated_physmap|pae_pgdir_above_4gb|supervisor_mode_kernel'
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
index f2d316c6f..d9cb6569c 100644
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='phy' type='raw'/>
       <source dev='/dev/vg_dom0test/test2vm'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr b/tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr
index c3ed8e8b9..dbaa57632 100644
--- a/tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr
@@ -2,7 +2,7 @@
 (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\
+(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
 (acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\
 (uname 'file:/root/foo.img')(mode 'w')))\
 (device (vbd (dev 'hdc:cdrom')\
diff --git a/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml b/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
index 463d3598b..77be06e94 100644
--- a/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
@@ -17,7 +17,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='file' device='disk'>
       <driver name='file' type='raw'/>
       <source file='/root/foo.img'/>
diff --git a/tests/xmconfigdata/test-escape-paths.cfg b/tests/xmconfigdata/test-escape-paths.cfg
index f13254edb..d3e410ffd 100644
--- a/tests/xmconfigdata/test-escape-paths.cfg
+++ b/tests/xmconfigdata/test-escape-paths.cfg
@@ -12,7 +12,7 @@ localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm&test"
+device_model = "/usr/lib/xen/bin/qemu-system-i386&test"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-escape-paths.xml b/tests/xmconfigdata/test-escape-paths.xml
index 712cc8679..d95d34e03 100644
--- a/tests/xmconfigdata/test-escape-paths.xml
+++ b/tests/xmconfigdata/test-escape-paths.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm&amp;test</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386&amp;test</emulator>
     <disk type='block' device='disk'>
       <driver name='phy' type='raw'/>
       <source dev='/dev/HostVG/XenGuest2'/>
diff --git a/tests/xmconfigdata/test-fullvirt-default-feature.cfg b/tests/xmconfigdata/test-fullvirt-default-feature.cfg
index f72575b53..b01e29023 100644
--- a/tests/xmconfigdata/test-fullvirt-default-feature.cfg
+++ b/tests/xmconfigdata/test-fullvirt-default-feature.cfg
@@ -13,7 +13,7 @@ localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-default-feature.xml b/tests/xmconfigdata/test-fullvirt-default-feature.xml
index b900ee0cf..fdbba8a3a 100644
--- a/tests/xmconfigdata/test-fullvirt-default-feature.xml
+++ b/tests/xmconfigdata/test-fullvirt-default-feature.xml
@@ -21,7 +21,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='phy' type='raw'/>
       <source dev='/dev/HostVG/XenGuest2'/>
diff --git a/tests/xmconfigdata/test-fullvirt-force-hpet.cfg b/tests/xmconfigdata/test-fullvirt-force-hpet.cfg
index d73b4e9f6..16fe98594 100644
--- a/tests/xmconfigdata/test-fullvirt-force-hpet.cfg
+++ b/tests/xmconfigdata/test-fullvirt-force-hpet.cfg
@@ -13,7 +13,7 @@ localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-force-hpet.xml b/tests/xmconfigdata/test-fullvirt-force-hpet.xml
index b900ee0cf..fdbba8a3a 100644
--- a/tests/xmconfigdata/test-fullvirt-force-hpet.xml
+++ b/tests/xmconfigdata/test-fullvirt-force-hpet.xml
@@ -21,7 +21,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='phy' type='raw'/>
       <source dev='/dev/HostVG/XenGuest2'/>
diff --git a/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg b/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg
index d670d36ab..eb118427c 100644
--- a/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg
+++ b/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg
@@ -13,7 +13,7 @@ localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml b/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
index fae684f21..e397a869e 100644
--- a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
+++ b/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
@@ -21,7 +21,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='phy' type='raw'/>
       <source dev='/dev/HostVG/XenGuest2'/>
diff --git a/tests/xmconfigdata/test-fullvirt-localtime.cfg b/tests/xmconfigdata/test-fullvirt-localtime.cfg
index d51be217f..2f8514d5e 100644
--- a/tests/xmconfigdata/test-fullvirt-localtime.cfg
+++ b/tests/xmconfigdata/test-fullvirt-localtime.cfg
@@ -12,7 +12,7 @@ localtime = 1
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-localtime.xml b/tests/xmconfigdata/test-fullvirt-localtime.xml
index ccb8f1a87..0a42cfd2a 100644
--- a/tests/xmconfigdata/test-fullvirt-localtime.xml
+++ b/tests/xmconfigdata/test-fullvirt-localtime.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='phy' type='raw'/>
       <source dev='/dev/HostVG/XenGuest2'/>
diff --git a/tests/xmconfigdata/test-fullvirt-net-netfront.cfg b/tests/xmconfigdata/test-fullvirt-net-netfront.cfg
index 254bd93b8..b744b2184 100644
--- a/tests/xmconfigdata/test-fullvirt-net-netfront.cfg
+++ b/tests/xmconfigdata/test-fullvirt-net-netfront.cfg
@@ -12,7 +12,7 @@ localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-net-netfront.xml b/tests/xmconfigdata/test-fullvirt-net-netfront.xml
index cc5c6658f..f57d6eb5c 100644
--- a/tests/xmconfigdata/test-fullvirt-net-netfront.xml
+++ b/tests/xmconfigdata/test-fullvirt-net-netfront.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='phy' type='raw'/>
       <source dev='/dev/HostVG/XenGuest2'/>
diff --git a/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg b/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg
index 5e12c5e6c..f9fce015e 100644
--- a/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg
+++ b/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg
@@ -12,7 +12,7 @@ localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
index 62253645a..4a496cebe 100644
--- a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
+++ b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='phy' type='raw'/>
       <source dev='/dev/HostVG/XenGuest2'/>
diff --git a/tests/xmconfigdata/test-fullvirt-nohap.cfg b/tests/xmconfigdata/test-fullvirt-nohap.cfg
index 67e251130..e5375dfdb 100644
--- a/tests/xmconfigdata/test-fullvirt-nohap.cfg
+++ b/tests/xmconfigdata/test-fullvirt-nohap.cfg
@@ -13,7 +13,7 @@ localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-nohap.xml b/tests/xmconfigdata/test-fullvirt-nohap.xml
index bbd177a11..d8ac37357 100644
--- a/tests/xmconfigdata/test-fullvirt-nohap.xml
+++ b/tests/xmconfigdata/test-fullvirt-nohap.xml
@@ -20,7 +20,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='phy' type='raw'/>
       <source dev='/dev/HostVG/XenGuest2'/>
diff --git a/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg b/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg
index df7b62133..94c52d975 100644
--- a/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg
+++ b/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg
@@ -12,7 +12,7 @@ localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
index f99e90979..d2cae8f98 100644
--- a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
+++ b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='phy' type='raw'/>
       <source dev='/dev/HostVG/XenGuest2'/>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-file.cfg b/tests/xmconfigdata/test-fullvirt-serial-file.cfg
index d5bd759fb..9193cc871 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-file.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-file.cfg
@@ -12,7 +12,7 @@ localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-serial-file.xml b/tests/xmconfigdata/test-fullvirt-serial-file.xml
index ccaa761d8..4b2b432ef 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-file.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-file.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='phy' type='raw'/>
       <source dev='/dev/HostVG/XenGuest2'/>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-null.cfg b/tests/xmconfigdata/test-fullvirt-serial-null.cfg
index d38f0849b..9ef60b4bd 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-null.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-null.cfg
@@ -12,7 +12,7 @@ localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-serial-null.xml b/tests/xmconfigdata/test-fullvirt-serial-null.xml
index 0010cf100..c657139fd 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-null.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-null.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='phy' type='raw'/>
       <source dev='/dev/HostVG/XenGuest2'/>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg b/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg
index 9ed3fb783..60e41ab55 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg
@@ -12,7 +12,7 @@ localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
index a2ce6f224..1cb8804bc 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='phy' type='raw'/>
       <source dev='/dev/HostVG/XenGuest2'/>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-pty.cfg b/tests/xmconfigdata/test-fullvirt-serial-pty.cfg
index b055f7960..d4e0763d1 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-pty.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-pty.cfg
@@ -12,7 +12,7 @@ localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-serial-pty.xml b/tests/xmconfigdata/test-fullvirt-serial-pty.xml
index 8485ae216..5dc5e2fa9 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-pty.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-pty.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='phy' type='raw'/>
       <source dev='/dev/HostVG/XenGuest2'/>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg b/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg
index 5fb13cdd1..efefe109b 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg
@@ -12,7 +12,7 @@ localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
index 5163e0f54..ece851585 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='phy' type='raw'/>
       <source dev='/dev/HostVG/XenGuest2'/>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg
index 2c0f166fb..224f5274e 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg
@@ -12,7 +12,7 @@ localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
index 760e57df4..bd5317787 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='phy' type='raw'/>
       <source dev='/dev/HostVG/XenGuest2'/>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg b/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg
index e90b3755b..e70ab847e 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg
@@ -12,7 +12,7 @@ localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
index 517f9ddfb..403bf68c0 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='phy' type='raw'/>
       <source dev='/dev/HostVG/XenGuest2'/>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-udp.cfg b/tests/xmconfigdata/test-fullvirt-serial-udp.cfg
index 082215d6b..9e7acdf0c 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-udp.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-udp.cfg
@@ -12,7 +12,7 @@ localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-serial-udp.xml b/tests/xmconfigdata/test-fullvirt-serial-udp.xml
index eee7365ae..5f0b6c0d1 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-udp.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-udp.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='phy' type='raw'/>
       <source dev='/dev/HostVG/XenGuest2'/>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-unix.cfg b/tests/xmconfigdata/test-fullvirt-serial-unix.cfg
index 2912473ce..964beba4f 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-unix.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-unix.cfg
@@ -12,7 +12,7 @@ localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-serial-unix.xml b/tests/xmconfigdata/test-fullvirt-serial-unix.xml
index 1b0f5a6e9..6f6b1cf5b 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-unix.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-unix.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='phy' type='raw'/>
       <source dev='/dev/HostVG/XenGuest2'/>
diff --git a/tests/xmconfigdata/test-fullvirt-sound.cfg b/tests/xmconfigdata/test-fullvirt-sound.cfg
index 6747e699f..501463f54 100644
--- a/tests/xmconfigdata/test-fullvirt-sound.cfg
+++ b/tests/xmconfigdata/test-fullvirt-sound.cfg
@@ -12,7 +12,7 @@ localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-sound.xml b/tests/xmconfigdata/test-fullvirt-sound.xml
index f13c920a5..0fbd9f6a4 100644
--- a/tests/xmconfigdata/test-fullvirt-sound.xml
+++ b/tests/xmconfigdata/test-fullvirt-sound.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='phy' type='raw'/>
       <source dev='/dev/HostVG/XenGuest2'/>
diff --git a/tests/xmconfigdata/test-fullvirt-usbmouse.cfg b/tests/xmconfigdata/test-fullvirt-usbmouse.cfg
index c7eb1c1b4..660f18e77 100644
--- a/tests/xmconfigdata/test-fullvirt-usbmouse.cfg
+++ b/tests/xmconfigdata/test-fullvirt-usbmouse.cfg
@@ -12,7 +12,7 @@ localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-usbmouse.xml b/tests/xmconfigdata/test-fullvirt-usbmouse.xml
index 2c855cd35..244a42b51 100644
--- a/tests/xmconfigdata/test-fullvirt-usbmouse.xml
+++ b/tests/xmconfigdata/test-fullvirt-usbmouse.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='phy' type='raw'/>
       <source dev='/dev/HostVG/XenGuest2'/>
diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml b/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml
index 23535eb70..6dff15ebd 100644
--- a/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml
+++ b/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml
@@ -19,7 +19,7 @@
   </features>
   <clock offset='utc' adjustment='reset'/>
   <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet.cfg b/tests/xmconfigdata/test-fullvirt-usbtablet.cfg
index 8921e7c9c..90428882c 100644
--- a/tests/xmconfigdata/test-fullvirt-usbtablet.cfg
+++ b/tests/xmconfigdata/test-fullvirt-usbtablet.cfg
@@ -12,7 +12,7 @@ localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet.xml b/tests/xmconfigdata/test-fullvirt-usbtablet.xml
index e82ffdca1..e315f7e65 100644
--- a/tests/xmconfigdata/test-fullvirt-usbtablet.xml
+++ b/tests/xmconfigdata/test-fullvirt-usbtablet.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='phy' type='raw'/>
       <source dev='/dev/HostVG/XenGuest2'/>
diff --git a/tests/xmconfigdata/test-fullvirt-utc.cfg b/tests/xmconfigdata/test-fullvirt-utc.cfg
index 5e12c5e6c..f9fce015e 100644
--- a/tests/xmconfigdata/test-fullvirt-utc.cfg
+++ b/tests/xmconfigdata/test-fullvirt-utc.cfg
@@ -12,7 +12,7 @@ localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-utc.xml b/tests/xmconfigdata/test-fullvirt-utc.xml
index 62253645a..4a496cebe 100644
--- a/tests/xmconfigdata/test-fullvirt-utc.xml
+++ b/tests/xmconfigdata/test-fullvirt-utc.xml
@@ -19,7 +19,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='phy' type='raw'/>
       <source dev='/dev/HostVG/XenGuest2'/>
diff --git a/tests/xmconfigdata/test-no-source-cdrom.cfg b/tests/xmconfigdata/test-no-source-cdrom.cfg
index 424042905..843996121 100644
--- a/tests/xmconfigdata/test-no-source-cdrom.cfg
+++ b/tests/xmconfigdata/test-no-source-cdrom.cfg
@@ -12,7 +12,7 @@ localtime = 0
 on_poweroff = "destroy"
 on_reboot = "destroy"
 on_crash = "destroy"
-device_model = "/usr/lib/xen/bin/qemu-dm"
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-no-source-cdrom.xml b/tests/xmconfigdata/test-no-source-cdrom.xml
index 5d0f3bd68..4a3915079 100644
--- a/tests/xmconfigdata/test-no-source-cdrom.xml
+++ b/tests/xmconfigdata/test-no-source-cdrom.xml
@@ -19,7 +19,7 @@
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='phy' type='raw'/>
       <source dev='/dev/sda8'/>
diff --git a/tests/xmconfigdata/test-pci-devs.cfg b/tests/xmconfigdata/test-pci-devs.cfg
index 1369b32bb..188227e18 100644
--- a/tests/xmconfigdata/test-pci-devs.cfg
+++ b/tests/xmconfigdata/test-pci-devs.cfg
@@ -12,7 +12,7 @@ localtime = 0
 on_poweroff = "destroy"
 on_reboot = "destroy"
 on_crash = "destroy"
-device_model = "/usr/lib/xen/bin/qemu-dm"
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-pci-devs.xml b/tests/xmconfigdata/test-pci-devs.xml
index f50e1947f..27f59c28b 100644
--- a/tests/xmconfigdata/test-pci-devs.xml
+++ b/tests/xmconfigdata/test-pci-devs.xml
@@ -19,7 +19,7 @@
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
     <disk type='block' device='disk'>
       <driver name='phy' type='raw'/>
       <source dev='/dev/sda8'/>
-- 
2.16.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] tests: Xen: use qemu-system-i386 for emulator

Posted by Jim Fehlig 22 weeks ago
Ping? It's a trivial patch that causes some test file churn, but IMO the 
consistency with other files and removal of deprecated config is worth it.

Regards,
Jim

On 04/11/2018 01:25 PM, Jim Fehlig wrote:
> Many of the old xm and sexpr test files used qemu-dm as the emulator.
> Modern Xen systems no longer use the old, forked qemu-dm, instead
> preferring the distro provided qemu or an "upstream" qemu that is
> built when the Xen tools are built. This qemu is typically installed
> in /usr/lib/xen/bin/qemu-system-i386.
> 
> The libxl test files already use /usr/lib/xen/bin/qemu-system-i386.
> For consistency, change the old test files to use the same emulator
> 
> Signed-off-by: Jim Fehlig <jfehlig@suse.com>
> ---
> 
> These config files can serve as examples too, so best not to
> encourage use of outdated/deprecated config.
> 
>   tests/sexpr2xmldata/sexpr2xml-fv-autoport.sexpr            | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml              | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr        | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml          | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr          | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml            | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr        | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml          | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr          | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml            | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr           | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml             | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr        | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml          | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr        | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml          | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr  | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml    | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml   | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr         | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml           | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr         | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml           | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr         | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml           | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr          | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml            | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr        | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml          | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr   | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml     | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr          | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml            | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr          | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml            | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr         | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml           | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr           | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml             | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr               | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-sound.xml                 | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr            | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml              | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr           | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml             | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr                 | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-utc.xml                   | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr                  | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv-v2.xml                    | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv.sexpr                     | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-fv.xml                       | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr        | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml          | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.sexpr      | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml        | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr               | 2 +-
>   tests/sexpr2xmldata/sexpr2xml-vif-rate.xml                 | 2 +-
>   tests/xmconfigdata/test-escape-paths.cfg                   | 2 +-
>   tests/xmconfigdata/test-escape-paths.xml                   | 2 +-
>   tests/xmconfigdata/test-fullvirt-default-feature.cfg       | 2 +-
>   tests/xmconfigdata/test-fullvirt-default-feature.xml       | 2 +-
>   tests/xmconfigdata/test-fullvirt-force-hpet.cfg            | 2 +-
>   tests/xmconfigdata/test-fullvirt-force-hpet.xml            | 2 +-
>   tests/xmconfigdata/test-fullvirt-force-nohpet.cfg          | 2 +-
>   tests/xmconfigdata/test-fullvirt-force-nohpet.xml          | 2 +-
>   tests/xmconfigdata/test-fullvirt-localtime.cfg             | 2 +-
>   tests/xmconfigdata/test-fullvirt-localtime.xml             | 2 +-
>   tests/xmconfigdata/test-fullvirt-net-netfront.cfg          | 2 +-
>   tests/xmconfigdata/test-fullvirt-net-netfront.xml          | 2 +-
>   tests/xmconfigdata/test-fullvirt-new-cdrom.cfg             | 2 +-
>   tests/xmconfigdata/test-fullvirt-new-cdrom.xml             | 2 +-
>   tests/xmconfigdata/test-fullvirt-nohap.cfg                 | 2 +-
>   tests/xmconfigdata/test-fullvirt-nohap.xml                 | 2 +-
>   tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg          | 2 +-
>   tests/xmconfigdata/test-fullvirt-parallel-tcp.xml          | 2 +-
>   tests/xmconfigdata/test-fullvirt-serial-file.cfg           | 2 +-
>   tests/xmconfigdata/test-fullvirt-serial-file.xml           | 2 +-
>   tests/xmconfigdata/test-fullvirt-serial-null.cfg           | 2 +-
>   tests/xmconfigdata/test-fullvirt-serial-null.xml           | 2 +-
>   tests/xmconfigdata/test-fullvirt-serial-pipe.cfg           | 2 +-
>   tests/xmconfigdata/test-fullvirt-serial-pipe.xml           | 2 +-
>   tests/xmconfigdata/test-fullvirt-serial-pty.cfg            | 2 +-
>   tests/xmconfigdata/test-fullvirt-serial-pty.xml            | 2 +-
>   tests/xmconfigdata/test-fullvirt-serial-stdio.cfg          | 2 +-
>   tests/xmconfigdata/test-fullvirt-serial-stdio.xml          | 2 +-
>   tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg     | 2 +-
>   tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml     | 2 +-
>   tests/xmconfigdata/test-fullvirt-serial-tcp.cfg            | 2 +-
>   tests/xmconfigdata/test-fullvirt-serial-tcp.xml            | 2 +-
>   tests/xmconfigdata/test-fullvirt-serial-udp.cfg            | 2 +-
>   tests/xmconfigdata/test-fullvirt-serial-udp.xml            | 2 +-
>   tests/xmconfigdata/test-fullvirt-serial-unix.cfg           | 2 +-
>   tests/xmconfigdata/test-fullvirt-serial-unix.xml           | 2 +-
>   tests/xmconfigdata/test-fullvirt-sound.cfg                 | 2 +-
>   tests/xmconfigdata/test-fullvirt-sound.xml                 | 2 +-
>   tests/xmconfigdata/test-fullvirt-usbmouse.cfg              | 2 +-
>   tests/xmconfigdata/test-fullvirt-usbmouse.xml              | 2 +-
>   tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml      | 2 +-
>   tests/xmconfigdata/test-fullvirt-usbtablet.cfg             | 2 +-
>   tests/xmconfigdata/test-fullvirt-usbtablet.xml             | 2 +-
>   tests/xmconfigdata/test-fullvirt-utc.cfg                   | 2 +-
>   tests/xmconfigdata/test-fullvirt-utc.xml                   | 2 +-
>   tests/xmconfigdata/test-no-source-cdrom.cfg                | 2 +-
>   tests/xmconfigdata/test-no-source-cdrom.xml                | 2 +-
>   tests/xmconfigdata/test-pci-devs.cfg                       | 2 +-
>   tests/xmconfigdata/test-pci-devs.xml                       | 2 +-
>   107 files changed, 107 insertions(+), 107 deletions(-)
> 
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.sexpr
> index a18418a17..cdbbaedee 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.sexpr
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.sexpr
> @@ -23,7 +23,7 @@
>           (hvm
>               (kernel /usr/lib/xen/boot/hvmloader)
>               (boot d)
> -            (device_model /usr/lib/xen/bin/qemu-dm)
> +            (device_model /usr/lib/xen/bin/qemu-system-i386)
>               (keymap en-us)
>               (localtime 1)
>               (pae 1)
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
> index 8eaacc86d..cf6683fee 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
> @@ -17,7 +17,7 @@
>     <on_reboot>destroy</on_reboot>
>     <on_crash>destroy</on_crash>
>     <devices>
> -    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='block' device='disk'>
>         <driver name='phy' type='raw'/>
>         <source dev='/iscsi/winxp'/>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr
> index 777f7e08b..1372025df 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr
> @@ -2,7 +2,7 @@
>   (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
>   (on_reboot 'restart')(on_crash 'restart')\
>   (image (hvm (loader /usr/lib/xen/boot/hvmloader)(kernel '')\
> -(device_model '/usr/lib64/xen/bin/qemu-dm')(boot d)(cdrom '/root/boot.iso')\
> +(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot d)(cdrom '/root/boot.iso')\
>   (acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'hda')\
>   (uname 'file:/root/foo.img')(mode 'w')))\
>   (device (vbd (dev 'hdc:cdrom')\
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
> index 8ed2261fc..dd5b46a6a 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
> @@ -17,7 +17,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='file' device='disk'>
>         <driver name='file' type='raw'/>
>         <source file='/root/foo.img'/>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr
> index 04cd2aebf..8f31abf18 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr
> @@ -3,7 +3,7 @@
>   (on_reboot 'restart')(on_crash 'restart')\
>   (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
>   (acpi 1)(usb 1)(parallel none)(serial none)\
> -(device_model '/usr/lib64/xen/bin/qemu-dm')(hpet 1)(vnc 1)))\
> +(device_model '/usr/lib/xen/bin/qemu-system-i386')(hpet 1)(vnc 1)))\
>   (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
>   (device (vbd (dev 'hdc:cdrom')\
>   (uname 'file:/root/boot.iso')(mode 'r')))\
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
> index 5e176bf91..4c120674b 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
> @@ -19,7 +19,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='file' device='disk'>
>         <driver name='file' type='raw'/>
>         <source file='/root/foo.img'/>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr
> index bcb092650..7fee66693 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr
> @@ -3,7 +3,7 @@
>   (on_reboot 'restart')(on_crash 'restart')\
>   (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
>   (acpi 1)(usb 1)(parallel none)(serial none)\
> -(device_model '/usr/lib64/xen/bin/qemu-dm')(hpet 0)(vnc 1)))\
> +(device_model '/usr/lib/xen/bin/qemu-system-i386')(hpet 0)(vnc 1)))\
>   (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
>   (device (vbd (dev 'hdc:cdrom')\
>   (uname 'file:/root/boot.iso')(mode 'r')))\
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
> index 826301182..5652e9a69 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
> @@ -19,7 +19,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='file' device='disk'>
>         <driver name='file' type='raw'/>
>         <source file='/root/foo.img'/>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr
> index 549b2800c..8bc6cfacf 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr
> @@ -23,7 +23,7 @@
>           (hvm
>               (kernel /usr/lib/xen/boot/hvmloader)
>               (boot c)
> -            (device_model /usr/lib/xen/bin/qemu-dm)
> +            (device_model /usr/lib/xen/bin/qemu-system-i386)
>               (keymap en-us)
>               (localtime 0)
>               (pae 1)
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml b/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml
> index 4f2a39b80..659dcfd8a 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml
> @@ -17,7 +17,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <interface type='ethernet'>
>         <target dev='vif1.0'/>
>         <mac address='00:16:3e:3b:b9:d7'/>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr
> index 5616d19e3..6673aef55 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr
> @@ -2,7 +2,7 @@
>   (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
>   (on_reboot 'restart')(on_crash 'restart')\
>   (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
> -(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\
> +(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
>   (acpi 1)(vnc 1)(keymap ja)(localtime 1)))\
>   (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
>   (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
> index 2d390b52a..d985afbf1 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
> @@ -17,7 +17,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='file' device='disk'>
>         <driver name='file' type='raw'/>
>         <source file='/root/foo.img'/>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr
> index b0a344cb4..3516e72a0 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr
> @@ -2,7 +2,7 @@
>   (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
>   (on_reboot 'restart')(on_crash 'restart')\
>   (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
> -(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\
> +(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
>   (acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\
>   (uname 'file:/root/foo.img')(mode 'w')))\
>   (device (vbd (dev 'hdc:cdrom')\
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
> index 5edf0ce26..c15fe80a1 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
> @@ -17,7 +17,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='file' device='disk'>
>         <driver name='file' type='raw'/>
>         <source file='/root/foo.img'/>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr
> index 8d017263d..662845291 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr
> @@ -3,7 +3,7 @@
>   (on_reboot 'restart')(on_crash 'restart')\
>   (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
>   (acpi 1)(usb 1)(parallel tcp:localhost:9999)\
> -(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
> +(serial none)(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
>   (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
>   (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
>   (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
> index eccab787b..2c4fd687a 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
> @@ -17,7 +17,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='file' device='disk'>
>         <driver name='file' type='raw'/>
>         <source file='/root/foo.img'/>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr
> index 8f5651813..a8d08340a 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr
> @@ -3,7 +3,7 @@
>   (on_reboot 'restart')(on_crash 'restart')\
>   (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
>   (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
> -(serial (/dev/ttyS0 /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')\
> +(serial (/dev/ttyS0 /dev/ttyS1))(device_model '/usr/lib/xen/bin/qemu-system-i386')\
>   (vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
>   (mode 'w')))\
>   (device (vbd (dev 'hdc:cdrom')\
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
> index 79e9e69c3..d72e503f8 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
> @@ -17,7 +17,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='file' device='disk'>
>         <driver name='file' type='raw'/>
>         <source file='/root/foo.img'/>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr
> index f0b992526..d9e7336ae 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr
> @@ -3,7 +3,7 @@
>   (on_reboot 'restart')(on_crash 'restart')\
>   (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
>   (acpi 1)(usb 1)(parallel none)\
> -(serial (none /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
> +(serial (none /dev/ttyS1))(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
>   (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
>   (device (vbd (dev 'hdc:cdrom')\
>   (uname 'file:/root/boot.iso')(mode 'r')))\
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
> index 111db35b1..860d24e05 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
> @@ -17,7 +17,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='file' device='disk'>
>         <driver name='file' type='raw'/>
>         <source file='/root/foo.img'/>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr
> index 0eac5a436..b52a5e455 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr
> @@ -3,7 +3,7 @@
>   (on_reboot 'restart')(on_crash 'restart')\
>   (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
>   (acpi 1)(usb 1)(parallel none)\
> -(serial file:/tmp/serial.log)(device_model '/usr/lib64/xen/bin/qemu-dm')\
> +(serial file:/tmp/serial.log)(device_model '/usr/lib/xen/bin/qemu-system-i386')\
>   (vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
>   (mode 'w')))\
>   (device (vbd (dev 'hdc:cdrom')\
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
> index 40d1c6e62..c56e5432c 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
> @@ -17,7 +17,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='file' device='disk'>
>         <driver name='file' type='raw'/>
>         <source file='/root/foo.img'/>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr
> index a00410cd5..caf8b4a87 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr
> @@ -3,7 +3,7 @@
>   (on_reboot 'restart')(on_crash 'restart')\
>   (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
>   (acpi 1)(usb 1)(parallel none)(serial null)\
> -(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
> +(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
>   (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
>   (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
>   (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
> index 60d5d8e9e..0615bf4b3 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
> @@ -17,7 +17,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='file' device='disk'>
>         <driver name='file' type='raw'/>
>         <source file='/root/foo.img'/>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr
> index 2b3a6610a..be3e13cd7 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr
> @@ -3,7 +3,7 @@
>   (on_reboot 'restart')(on_crash 'restart')\
>   (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
>   (acpi 1)(usb 1)(parallel none)\
> -(serial pipe:/tmp/serial.pipe)(device_model '/usr/lib64/xen/bin/qemu-dm')\
> +(serial pipe:/tmp/serial.pipe)(device_model '/usr/lib/xen/bin/qemu-system-i386')\
>   (vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
>   (mode 'w')))\
>   (device (vbd (dev 'hdc:cdrom')\
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
> index 55a4e9e0b..00518e62f 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
> @@ -17,7 +17,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='file' device='disk'>
>         <driver name='file' type='raw'/>
>         <source file='/root/foo.img'/>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr
> index 1029c1a25..3ac68630c 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr
> @@ -3,7 +3,7 @@
>   (on_reboot 'restart')(on_crash 'restart')\
>   (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
>   (acpi 1)(usb 1)(parallel none)(serial pty)\
> -(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
> +(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
>   (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
>   (device (vbd (dev 'hdc:cdrom')\
>   (uname 'file:/root/boot.iso')(mode 'r')))\
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
> index 78ddea603..e9d3c0e6a 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
> @@ -17,7 +17,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='file' device='disk'>
>         <driver name='file' type='raw'/>
>         <source file='/root/foo.img'/>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr
> index 05a9a1d91..e3eb554ea 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr
> @@ -3,7 +3,7 @@
>   (on_reboot 'restart')(on_crash 'restart')\
>   (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
>   (acpi 1)(usb 1)(parallel none)(serial stdio)\
> -(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
> +(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
>   (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
>   (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
>   (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
> index 112830ac7..5cdcd25d9 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
> @@ -17,7 +17,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='file' device='disk'>
>         <driver name='file' type='raw'/>
>         <source file='/root/foo.img'/>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr
> index 0d80f8aca..8107efebb 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr
> @@ -4,7 +4,7 @@
>   (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
>   (acpi 1)(usb 1)(parallel none)\
>   (serial telnet:localhost:9999,server,nowait)\
> -(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
> +(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
>   (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
>   (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
>   (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
> index ab2450469..8457f49f8 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
> @@ -17,7 +17,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='file' device='disk'>
>         <driver name='file' type='raw'/>
>         <source file='/root/foo.img'/>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr
> index 44f2bfe8d..32cb2ba07 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr
> @@ -4,7 +4,7 @@
>   (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
>   (acpi 1)(usb 1)(parallel none)\
>   (serial tcp:localhost:9999,server,nowait)\
> -(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
> +(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
>   (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
>   (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
>   (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
> index b6afd9b31..973f8c1cd 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
> @@ -17,7 +17,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='file' device='disk'>
>         <driver name='file' type='raw'/>
>         <source file='/root/foo.img'/>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr
> index 2efedf2e5..3eea32995 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr
> @@ -4,7 +4,7 @@
>   (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
>   (acpi 1)(usb 1)(parallel none)\
>   (serial udp:localhost:9998@localhost:9999)\
> -(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
> +(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
>   (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
>   (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
>   (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
> index cdc05bc52..2f14f17be 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
> @@ -17,7 +17,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='file' device='disk'>
>         <driver name='file' type='raw'/>
>         <source file='/root/foo.img'/>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr
> index 356677e2c..aff06a67f 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr
> @@ -4,7 +4,7 @@
>   (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
>   (acpi 1)(usb 1)(parallel none)\
>   (serial unix:/tmp/serial.sock,server,nowait)\
> -(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
> +(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
>   (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
>   (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
>   (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
> index 0fa40e95d..c2f32144e 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
> @@ -17,7 +17,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='file' device='disk'>
>         <driver name='file' type='raw'/>
>         <source file='/root/foo.img'/>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr
> index d99e13a7e..6b0e82236 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr
> @@ -2,7 +2,7 @@
>   (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
>   (on_reboot 'restart')(on_crash 'restart')\
>   (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
> -(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\
> +(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
>   (acpi 1)(vnc 1)(keymap ja)(soundhw 'all')))(device (vbd (dev 'ioemu:hda')\
>   (uname 'file:/root/foo.img')(mode 'w')))\
>   (device (vbd (dev 'hdc:cdrom')\
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
> index def03321a..c2ea63f3b 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
> @@ -17,7 +17,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='file' device='disk'>
>         <driver name='file' type='raw'/>
>         <source file='/root/foo.img'/>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr
> index 50d67154e..9552b9b72 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr
> @@ -2,7 +2,7 @@
>   (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
>   (on_reboot 'restart')(on_crash 'restart')\
>   (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
> -(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\
> +(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
>   (acpi 1)(vnc 1)(keymap ja)(soundhw 'sb16,es1370')))\
>   (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
>   (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
> index def03321a..c2ea63f3b 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
> @@ -17,7 +17,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='file' device='disk'>
>         <driver name='file' type='raw'/>
>         <source file='/root/foo.img'/>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr
> index 789082ef0..7a10c496b 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr
> @@ -2,7 +2,7 @@
>   (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
>   (on_reboot 'restart')(on_crash 'restart')\
>   (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
> -(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\
> +(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
>   (acpi 1)(usbdevice mouse)(vnc 1)(keymap ja)))\
>   (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
>   (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
> index ded0aa853..1f919b8c0 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
> @@ -17,7 +17,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='file' device='disk'>
>         <driver name='file' type='raw'/>
>         <source file='/root/foo.img'/>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr
> index e2f77a167..3a2eec794 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr
> @@ -2,7 +2,7 @@
>   (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
>   (on_reboot 'restart')(on_crash 'restart')\
>   (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
> -(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\
> +(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
>   (acpi 1)(usb 1)(usbdevice tablet)(vnc 1)(keymap ja)))\
>   (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
>   (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
> index 48ce7cebf..639517ee3 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
> @@ -17,7 +17,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='file' device='disk'>
>         <driver name='file' type='raw'/>
>         <source file='/root/foo.img'/>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr
> index 7bfbfaec6..09b7ecd8f 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr
> @@ -2,7 +2,7 @@
>   (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
>   (on_reboot 'restart')(on_crash 'restart')\
>   (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
> -(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')\
> +(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)(cdrom '/root/boot.iso')\
>   (acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\
>   (uname 'file:/root/foo.img')(mode 'w')))\
>   (device (vbd (dev 'hdc:cdrom')\
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
> index 1ae44a1d3..d281090c6 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
> @@ -17,7 +17,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='file' device='disk'>
>         <driver name='file' type='raw'/>
>         <source file='/root/foo.img'/>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr
> index 92e807c65..135b374c2 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr
> @@ -2,7 +2,7 @@
>   (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
>   (on_reboot 'restart')(on_crash 'restart')\
>   (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
> -(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(acpi 1)(vnc 1)\
> +(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)(acpi 1)(vnc 1)\
>   (keymap ja)))(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')\
>   (mode 'w')))(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')\
>   (mode 'r')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
> index 1ae44a1d3..d281090c6 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
> @@ -17,7 +17,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='file' device='disk'>
>         <driver name='file' type='raw'/>
>         <source file='/root/foo.img'/>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv.sexpr
> index dc4cbf59f..46794a5a1 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv.sexpr
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv.sexpr
> @@ -2,7 +2,7 @@
>   (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
>   (on_reboot 'restart')(on_crash 'restart')\
>   (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
> -(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\
> +(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
>   (acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\
>   (uname 'file:/root/foo.img')(mode 'w')))\
>   (device (vbd (dev 'hdc:cdrom')\
> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv.xml b/tests/sexpr2xmldata/sexpr2xml-fv.xml
> index 1ae44a1d3..d281090c6 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-fv.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-fv.xml
> @@ -17,7 +17,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='file' device='disk'>
>         <driver name='file' type='raw'/>
>         <source file='/root/foo.img'/>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr
> index f3e4901e4..bd75f6190 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr
> +++ b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr
> @@ -25,7 +25,7 @@
>               (kernel /usr/lib/xen/boot/hvmloader)
>               (vnc 1)
>               (vncunused 1)
> -            (device_model /usr/lib/xen/bin/qemu-dm)
> +            (device_model /usr/lib/xen/bin/qemu-system-i386)
>               (pae 1)
>               (apic 1)
>               (acpi 1)
> diff --git a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
> index 975318294..a02104d0d 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
> @@ -19,7 +19,7 @@
>     <on_reboot>destroy</on_reboot>
>     <on_crash>destroy</on_crash>
>     <devices>
> -    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='block' device='disk'>
>         <driver name='phy' type='raw'/>
>         <source dev='/dev/sda8'/>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.sexpr b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.sexpr
> index e01ecb984..b6511a96f 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.sexpr
> +++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.sexpr
> @@ -21,7 +21,7 @@
>       (image
>           (linux
>               (kernel )
> -            (device_model /usr/lib/xen/bin/qemu-dm)
> +            (device_model /usr/lib/xen/bin/qemu-system-i386)
>               (notes
>                   (FEATURES
>   'writable_page_tables|writable_descriptor_tables|auto_translated_physmap|pae_pgdir_above_4gb|supervisor_mode_kernel'
> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
> index f2d316c6f..d9cb6569c 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
> @@ -13,7 +13,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='block' device='disk'>
>         <driver name='phy' type='raw'/>
>         <source dev='/dev/vg_dom0test/test2vm'/>
> diff --git a/tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr b/tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr
> index c3ed8e8b9..dbaa57632 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr
> +++ b/tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr
> @@ -2,7 +2,7 @@
>   (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
>   (on_reboot 'restart')(on_crash 'restart')\
>   (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
> -(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\
> +(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
>   (acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\
>   (uname 'file:/root/foo.img')(mode 'w')))\
>   (device (vbd (dev 'hdc:cdrom')\
> diff --git a/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml b/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
> index 463d3598b..77be06e94 100644
> --- a/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
> +++ b/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
> @@ -17,7 +17,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='file' device='disk'>
>         <driver name='file' type='raw'/>
>         <source file='/root/foo.img'/>
> diff --git a/tests/xmconfigdata/test-escape-paths.cfg b/tests/xmconfigdata/test-escape-paths.cfg
> index f13254edb..d3e410ffd 100644
> --- a/tests/xmconfigdata/test-escape-paths.cfg
> +++ b/tests/xmconfigdata/test-escape-paths.cfg
> @@ -12,7 +12,7 @@ localtime = 0
>   on_poweroff = "destroy"
>   on_reboot = "restart"
>   on_crash = "restart"
> -device_model = "/usr/lib/xen/bin/qemu-dm&test"
> +device_model = "/usr/lib/xen/bin/qemu-system-i386&test"
>   sdl = 0
>   vnc = 1
>   vncunused = 1
> diff --git a/tests/xmconfigdata/test-escape-paths.xml b/tests/xmconfigdata/test-escape-paths.xml
> index 712cc8679..d95d34e03 100644
> --- a/tests/xmconfigdata/test-escape-paths.xml
> +++ b/tests/xmconfigdata/test-escape-paths.xml
> @@ -19,7 +19,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib/xen/bin/qemu-dm&amp;test</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386&amp;test</emulator>
>       <disk type='block' device='disk'>
>         <driver name='phy' type='raw'/>
>         <source dev='/dev/HostVG/XenGuest2'/>
> diff --git a/tests/xmconfigdata/test-fullvirt-default-feature.cfg b/tests/xmconfigdata/test-fullvirt-default-feature.cfg
> index f72575b53..b01e29023 100644
> --- a/tests/xmconfigdata/test-fullvirt-default-feature.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-default-feature.cfg
> @@ -13,7 +13,7 @@ localtime = 0
>   on_poweroff = "destroy"
>   on_reboot = "restart"
>   on_crash = "restart"
> -device_model = "/usr/lib/xen/bin/qemu-dm"
> +device_model = "/usr/lib/xen/bin/qemu-system-i386"
>   sdl = 0
>   vnc = 1
>   vncunused = 1
> diff --git a/tests/xmconfigdata/test-fullvirt-default-feature.xml b/tests/xmconfigdata/test-fullvirt-default-feature.xml
> index b900ee0cf..fdbba8a3a 100644
> --- a/tests/xmconfigdata/test-fullvirt-default-feature.xml
> +++ b/tests/xmconfigdata/test-fullvirt-default-feature.xml
> @@ -21,7 +21,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='block' device='disk'>
>         <driver name='phy' type='raw'/>
>         <source dev='/dev/HostVG/XenGuest2'/>
> diff --git a/tests/xmconfigdata/test-fullvirt-force-hpet.cfg b/tests/xmconfigdata/test-fullvirt-force-hpet.cfg
> index d73b4e9f6..16fe98594 100644
> --- a/tests/xmconfigdata/test-fullvirt-force-hpet.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-force-hpet.cfg
> @@ -13,7 +13,7 @@ localtime = 0
>   on_poweroff = "destroy"
>   on_reboot = "restart"
>   on_crash = "restart"
> -device_model = "/usr/lib/xen/bin/qemu-dm"
> +device_model = "/usr/lib/xen/bin/qemu-system-i386"
>   sdl = 0
>   vnc = 1
>   vncunused = 1
> diff --git a/tests/xmconfigdata/test-fullvirt-force-hpet.xml b/tests/xmconfigdata/test-fullvirt-force-hpet.xml
> index b900ee0cf..fdbba8a3a 100644
> --- a/tests/xmconfigdata/test-fullvirt-force-hpet.xml
> +++ b/tests/xmconfigdata/test-fullvirt-force-hpet.xml
> @@ -21,7 +21,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='block' device='disk'>
>         <driver name='phy' type='raw'/>
>         <source dev='/dev/HostVG/XenGuest2'/>
> diff --git a/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg b/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg
> index d670d36ab..eb118427c 100644
> --- a/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg
> @@ -13,7 +13,7 @@ localtime = 0
>   on_poweroff = "destroy"
>   on_reboot = "restart"
>   on_crash = "restart"
> -device_model = "/usr/lib/xen/bin/qemu-dm"
> +device_model = "/usr/lib/xen/bin/qemu-system-i386"
>   sdl = 0
>   vnc = 1
>   vncunused = 1
> diff --git a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml b/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
> index fae684f21..e397a869e 100644
> --- a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
> +++ b/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
> @@ -21,7 +21,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='block' device='disk'>
>         <driver name='phy' type='raw'/>
>         <source dev='/dev/HostVG/XenGuest2'/>
> diff --git a/tests/xmconfigdata/test-fullvirt-localtime.cfg b/tests/xmconfigdata/test-fullvirt-localtime.cfg
> index d51be217f..2f8514d5e 100644
> --- a/tests/xmconfigdata/test-fullvirt-localtime.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-localtime.cfg
> @@ -12,7 +12,7 @@ localtime = 1
>   on_poweroff = "destroy"
>   on_reboot = "restart"
>   on_crash = "restart"
> -device_model = "/usr/lib/xen/bin/qemu-dm"
> +device_model = "/usr/lib/xen/bin/qemu-system-i386"
>   sdl = 0
>   vnc = 1
>   vncunused = 1
> diff --git a/tests/xmconfigdata/test-fullvirt-localtime.xml b/tests/xmconfigdata/test-fullvirt-localtime.xml
> index ccb8f1a87..0a42cfd2a 100644
> --- a/tests/xmconfigdata/test-fullvirt-localtime.xml
> +++ b/tests/xmconfigdata/test-fullvirt-localtime.xml
> @@ -19,7 +19,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='block' device='disk'>
>         <driver name='phy' type='raw'/>
>         <source dev='/dev/HostVG/XenGuest2'/>
> diff --git a/tests/xmconfigdata/test-fullvirt-net-netfront.cfg b/tests/xmconfigdata/test-fullvirt-net-netfront.cfg
> index 254bd93b8..b744b2184 100644
> --- a/tests/xmconfigdata/test-fullvirt-net-netfront.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-net-netfront.cfg
> @@ -12,7 +12,7 @@ localtime = 0
>   on_poweroff = "destroy"
>   on_reboot = "restart"
>   on_crash = "restart"
> -device_model = "/usr/lib/xen/bin/qemu-dm"
> +device_model = "/usr/lib/xen/bin/qemu-system-i386"
>   sdl = 0
>   vnc = 1
>   vncunused = 1
> diff --git a/tests/xmconfigdata/test-fullvirt-net-netfront.xml b/tests/xmconfigdata/test-fullvirt-net-netfront.xml
> index cc5c6658f..f57d6eb5c 100644
> --- a/tests/xmconfigdata/test-fullvirt-net-netfront.xml
> +++ b/tests/xmconfigdata/test-fullvirt-net-netfront.xml
> @@ -19,7 +19,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='block' device='disk'>
>         <driver name='phy' type='raw'/>
>         <source dev='/dev/HostVG/XenGuest2'/>
> diff --git a/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg b/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg
> index 5e12c5e6c..f9fce015e 100644
> --- a/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg
> @@ -12,7 +12,7 @@ localtime = 0
>   on_poweroff = "destroy"
>   on_reboot = "restart"
>   on_crash = "restart"
> -device_model = "/usr/lib/xen/bin/qemu-dm"
> +device_model = "/usr/lib/xen/bin/qemu-system-i386"
>   sdl = 0
>   vnc = 1
>   vncunused = 1
> diff --git a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
> index 62253645a..4a496cebe 100644
> --- a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
> +++ b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
> @@ -19,7 +19,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='block' device='disk'>
>         <driver name='phy' type='raw'/>
>         <source dev='/dev/HostVG/XenGuest2'/>
> diff --git a/tests/xmconfigdata/test-fullvirt-nohap.cfg b/tests/xmconfigdata/test-fullvirt-nohap.cfg
> index 67e251130..e5375dfdb 100644
> --- a/tests/xmconfigdata/test-fullvirt-nohap.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-nohap.cfg
> @@ -13,7 +13,7 @@ localtime = 0
>   on_poweroff = "destroy"
>   on_reboot = "restart"
>   on_crash = "restart"
> -device_model = "/usr/lib/xen/bin/qemu-dm"
> +device_model = "/usr/lib/xen/bin/qemu-system-i386"
>   sdl = 0
>   vnc = 1
>   vncunused = 1
> diff --git a/tests/xmconfigdata/test-fullvirt-nohap.xml b/tests/xmconfigdata/test-fullvirt-nohap.xml
> index bbd177a11..d8ac37357 100644
> --- a/tests/xmconfigdata/test-fullvirt-nohap.xml
> +++ b/tests/xmconfigdata/test-fullvirt-nohap.xml
> @@ -20,7 +20,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='block' device='disk'>
>         <driver name='phy' type='raw'/>
>         <source dev='/dev/HostVG/XenGuest2'/>
> diff --git a/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg b/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg
> index df7b62133..94c52d975 100644
> --- a/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg
> @@ -12,7 +12,7 @@ localtime = 0
>   on_poweroff = "destroy"
>   on_reboot = "restart"
>   on_crash = "restart"
> -device_model = "/usr/lib/xen/bin/qemu-dm"
> +device_model = "/usr/lib/xen/bin/qemu-system-i386"
>   sdl = 0
>   vnc = 1
>   vncunused = 1
> diff --git a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
> index f99e90979..d2cae8f98 100644
> --- a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
> +++ b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
> @@ -19,7 +19,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='block' device='disk'>
>         <driver name='phy' type='raw'/>
>         <source dev='/dev/HostVG/XenGuest2'/>
> diff --git a/tests/xmconfigdata/test-fullvirt-serial-file.cfg b/tests/xmconfigdata/test-fullvirt-serial-file.cfg
> index d5bd759fb..9193cc871 100644
> --- a/tests/xmconfigdata/test-fullvirt-serial-file.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-serial-file.cfg
> @@ -12,7 +12,7 @@ localtime = 0
>   on_poweroff = "destroy"
>   on_reboot = "restart"
>   on_crash = "restart"
> -device_model = "/usr/lib/xen/bin/qemu-dm"
> +device_model = "/usr/lib/xen/bin/qemu-system-i386"
>   sdl = 0
>   vnc = 1
>   vncunused = 1
> diff --git a/tests/xmconfigdata/test-fullvirt-serial-file.xml b/tests/xmconfigdata/test-fullvirt-serial-file.xml
> index ccaa761d8..4b2b432ef 100644
> --- a/tests/xmconfigdata/test-fullvirt-serial-file.xml
> +++ b/tests/xmconfigdata/test-fullvirt-serial-file.xml
> @@ -19,7 +19,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='block' device='disk'>
>         <driver name='phy' type='raw'/>
>         <source dev='/dev/HostVG/XenGuest2'/>
> diff --git a/tests/xmconfigdata/test-fullvirt-serial-null.cfg b/tests/xmconfigdata/test-fullvirt-serial-null.cfg
> index d38f0849b..9ef60b4bd 100644
> --- a/tests/xmconfigdata/test-fullvirt-serial-null.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-serial-null.cfg
> @@ -12,7 +12,7 @@ localtime = 0
>   on_poweroff = "destroy"
>   on_reboot = "restart"
>   on_crash = "restart"
> -device_model = "/usr/lib/xen/bin/qemu-dm"
> +device_model = "/usr/lib/xen/bin/qemu-system-i386"
>   sdl = 0
>   vnc = 1
>   vncunused = 1
> diff --git a/tests/xmconfigdata/test-fullvirt-serial-null.xml b/tests/xmconfigdata/test-fullvirt-serial-null.xml
> index 0010cf100..c657139fd 100644
> --- a/tests/xmconfigdata/test-fullvirt-serial-null.xml
> +++ b/tests/xmconfigdata/test-fullvirt-serial-null.xml
> @@ -19,7 +19,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='block' device='disk'>
>         <driver name='phy' type='raw'/>
>         <source dev='/dev/HostVG/XenGuest2'/>
> diff --git a/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg b/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg
> index 9ed3fb783..60e41ab55 100644
> --- a/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg
> @@ -12,7 +12,7 @@ localtime = 0
>   on_poweroff = "destroy"
>   on_reboot = "restart"
>   on_crash = "restart"
> -device_model = "/usr/lib/xen/bin/qemu-dm"
> +device_model = "/usr/lib/xen/bin/qemu-system-i386"
>   sdl = 0
>   vnc = 1
>   vncunused = 1
> diff --git a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
> index a2ce6f224..1cb8804bc 100644
> --- a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
> +++ b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
> @@ -19,7 +19,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='block' device='disk'>
>         <driver name='phy' type='raw'/>
>         <source dev='/dev/HostVG/XenGuest2'/>
> diff --git a/tests/xmconfigdata/test-fullvirt-serial-pty.cfg b/tests/xmconfigdata/test-fullvirt-serial-pty.cfg
> index b055f7960..d4e0763d1 100644
> --- a/tests/xmconfigdata/test-fullvirt-serial-pty.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-serial-pty.cfg
> @@ -12,7 +12,7 @@ localtime = 0
>   on_poweroff = "destroy"
>   on_reboot = "restart"
>   on_crash = "restart"
> -device_model = "/usr/lib/xen/bin/qemu-dm"
> +device_model = "/usr/lib/xen/bin/qemu-system-i386"
>   sdl = 0
>   vnc = 1
>   vncunused = 1
> diff --git a/tests/xmconfigdata/test-fullvirt-serial-pty.xml b/tests/xmconfigdata/test-fullvirt-serial-pty.xml
> index 8485ae216..5dc5e2fa9 100644
> --- a/tests/xmconfigdata/test-fullvirt-serial-pty.xml
> +++ b/tests/xmconfigdata/test-fullvirt-serial-pty.xml
> @@ -19,7 +19,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='block' device='disk'>
>         <driver name='phy' type='raw'/>
>         <source dev='/dev/HostVG/XenGuest2'/>
> diff --git a/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg b/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg
> index 5fb13cdd1..efefe109b 100644
> --- a/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg
> @@ -12,7 +12,7 @@ localtime = 0
>   on_poweroff = "destroy"
>   on_reboot = "restart"
>   on_crash = "restart"
> -device_model = "/usr/lib/xen/bin/qemu-dm"
> +device_model = "/usr/lib/xen/bin/qemu-system-i386"
>   sdl = 0
>   vnc = 1
>   vncunused = 1
> diff --git a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
> index 5163e0f54..ece851585 100644
> --- a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
> +++ b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
> @@ -19,7 +19,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='block' device='disk'>
>         <driver name='phy' type='raw'/>
>         <source dev='/dev/HostVG/XenGuest2'/>
> diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg
> index 2c0f166fb..224f5274e 100644
> --- a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg
> @@ -12,7 +12,7 @@ localtime = 0
>   on_poweroff = "destroy"
>   on_reboot = "restart"
>   on_crash = "restart"
> -device_model = "/usr/lib/xen/bin/qemu-dm"
> +device_model = "/usr/lib/xen/bin/qemu-system-i386"
>   sdl = 0
>   vnc = 1
>   vncunused = 1
> diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
> index 760e57df4..bd5317787 100644
> --- a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
> +++ b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
> @@ -19,7 +19,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='block' device='disk'>
>         <driver name='phy' type='raw'/>
>         <source dev='/dev/HostVG/XenGuest2'/>
> diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg b/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg
> index e90b3755b..e70ab847e 100644
> --- a/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg
> @@ -12,7 +12,7 @@ localtime = 0
>   on_poweroff = "destroy"
>   on_reboot = "restart"
>   on_crash = "restart"
> -device_model = "/usr/lib/xen/bin/qemu-dm"
> +device_model = "/usr/lib/xen/bin/qemu-system-i386"
>   sdl = 0
>   vnc = 1
>   vncunused = 1
> diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
> index 517f9ddfb..403bf68c0 100644
> --- a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
> +++ b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
> @@ -19,7 +19,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='block' device='disk'>
>         <driver name='phy' type='raw'/>
>         <source dev='/dev/HostVG/XenGuest2'/>
> diff --git a/tests/xmconfigdata/test-fullvirt-serial-udp.cfg b/tests/xmconfigdata/test-fullvirt-serial-udp.cfg
> index 082215d6b..9e7acdf0c 100644
> --- a/tests/xmconfigdata/test-fullvirt-serial-udp.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-serial-udp.cfg
> @@ -12,7 +12,7 @@ localtime = 0
>   on_poweroff = "destroy"
>   on_reboot = "restart"
>   on_crash = "restart"
> -device_model = "/usr/lib/xen/bin/qemu-dm"
> +device_model = "/usr/lib/xen/bin/qemu-system-i386"
>   sdl = 0
>   vnc = 1
>   vncunused = 1
> diff --git a/tests/xmconfigdata/test-fullvirt-serial-udp.xml b/tests/xmconfigdata/test-fullvirt-serial-udp.xml
> index eee7365ae..5f0b6c0d1 100644
> --- a/tests/xmconfigdata/test-fullvirt-serial-udp.xml
> +++ b/tests/xmconfigdata/test-fullvirt-serial-udp.xml
> @@ -19,7 +19,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='block' device='disk'>
>         <driver name='phy' type='raw'/>
>         <source dev='/dev/HostVG/XenGuest2'/>
> diff --git a/tests/xmconfigdata/test-fullvirt-serial-unix.cfg b/tests/xmconfigdata/test-fullvirt-serial-unix.cfg
> index 2912473ce..964beba4f 100644
> --- a/tests/xmconfigdata/test-fullvirt-serial-unix.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-serial-unix.cfg
> @@ -12,7 +12,7 @@ localtime = 0
>   on_poweroff = "destroy"
>   on_reboot = "restart"
>   on_crash = "restart"
> -device_model = "/usr/lib/xen/bin/qemu-dm"
> +device_model = "/usr/lib/xen/bin/qemu-system-i386"
>   sdl = 0
>   vnc = 1
>   vncunused = 1
> diff --git a/tests/xmconfigdata/test-fullvirt-serial-unix.xml b/tests/xmconfigdata/test-fullvirt-serial-unix.xml
> index 1b0f5a6e9..6f6b1cf5b 100644
> --- a/tests/xmconfigdata/test-fullvirt-serial-unix.xml
> +++ b/tests/xmconfigdata/test-fullvirt-serial-unix.xml
> @@ -19,7 +19,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='block' device='disk'>
>         <driver name='phy' type='raw'/>
>         <source dev='/dev/HostVG/XenGuest2'/>
> diff --git a/tests/xmconfigdata/test-fullvirt-sound.cfg b/tests/xmconfigdata/test-fullvirt-sound.cfg
> index 6747e699f..501463f54 100644
> --- a/tests/xmconfigdata/test-fullvirt-sound.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-sound.cfg
> @@ -12,7 +12,7 @@ localtime = 0
>   on_poweroff = "destroy"
>   on_reboot = "restart"
>   on_crash = "restart"
> -device_model = "/usr/lib/xen/bin/qemu-dm"
> +device_model = "/usr/lib/xen/bin/qemu-system-i386"
>   sdl = 0
>   vnc = 1
>   vncunused = 1
> diff --git a/tests/xmconfigdata/test-fullvirt-sound.xml b/tests/xmconfigdata/test-fullvirt-sound.xml
> index f13c920a5..0fbd9f6a4 100644
> --- a/tests/xmconfigdata/test-fullvirt-sound.xml
> +++ b/tests/xmconfigdata/test-fullvirt-sound.xml
> @@ -19,7 +19,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='block' device='disk'>
>         <driver name='phy' type='raw'/>
>         <source dev='/dev/HostVG/XenGuest2'/>
> diff --git a/tests/xmconfigdata/test-fullvirt-usbmouse.cfg b/tests/xmconfigdata/test-fullvirt-usbmouse.cfg
> index c7eb1c1b4..660f18e77 100644
> --- a/tests/xmconfigdata/test-fullvirt-usbmouse.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-usbmouse.cfg
> @@ -12,7 +12,7 @@ localtime = 0
>   on_poweroff = "destroy"
>   on_reboot = "restart"
>   on_crash = "restart"
> -device_model = "/usr/lib/xen/bin/qemu-dm"
> +device_model = "/usr/lib/xen/bin/qemu-system-i386"
>   sdl = 0
>   vnc = 1
>   vncunused = 1
> diff --git a/tests/xmconfigdata/test-fullvirt-usbmouse.xml b/tests/xmconfigdata/test-fullvirt-usbmouse.xml
> index 2c855cd35..244a42b51 100644
> --- a/tests/xmconfigdata/test-fullvirt-usbmouse.xml
> +++ b/tests/xmconfigdata/test-fullvirt-usbmouse.xml
> @@ -19,7 +19,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='block' device='disk'>
>         <driver name='phy' type='raw'/>
>         <source dev='/dev/HostVG/XenGuest2'/>
> diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml b/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml
> index 23535eb70..6dff15ebd 100644
> --- a/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml
> +++ b/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml
> @@ -19,7 +19,7 @@
>     </features>
>     <clock offset='utc' adjustment='reset'/>
>     <devices>
> -    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='block' device='disk'>
>         <driver name='phy'/>
>         <source dev='/dev/HostVG/XenGuest2'/>
> diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet.cfg b/tests/xmconfigdata/test-fullvirt-usbtablet.cfg
> index 8921e7c9c..90428882c 100644
> --- a/tests/xmconfigdata/test-fullvirt-usbtablet.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-usbtablet.cfg
> @@ -12,7 +12,7 @@ localtime = 0
>   on_poweroff = "destroy"
>   on_reboot = "restart"
>   on_crash = "restart"
> -device_model = "/usr/lib/xen/bin/qemu-dm"
> +device_model = "/usr/lib/xen/bin/qemu-system-i386"
>   sdl = 0
>   vnc = 1
>   vncunused = 1
> diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet.xml b/tests/xmconfigdata/test-fullvirt-usbtablet.xml
> index e82ffdca1..e315f7e65 100644
> --- a/tests/xmconfigdata/test-fullvirt-usbtablet.xml
> +++ b/tests/xmconfigdata/test-fullvirt-usbtablet.xml
> @@ -19,7 +19,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='block' device='disk'>
>         <driver name='phy' type='raw'/>
>         <source dev='/dev/HostVG/XenGuest2'/>
> diff --git a/tests/xmconfigdata/test-fullvirt-utc.cfg b/tests/xmconfigdata/test-fullvirt-utc.cfg
> index 5e12c5e6c..f9fce015e 100644
> --- a/tests/xmconfigdata/test-fullvirt-utc.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-utc.cfg
> @@ -12,7 +12,7 @@ localtime = 0
>   on_poweroff = "destroy"
>   on_reboot = "restart"
>   on_crash = "restart"
> -device_model = "/usr/lib/xen/bin/qemu-dm"
> +device_model = "/usr/lib/xen/bin/qemu-system-i386"
>   sdl = 0
>   vnc = 1
>   vncunused = 1
> diff --git a/tests/xmconfigdata/test-fullvirt-utc.xml b/tests/xmconfigdata/test-fullvirt-utc.xml
> index 62253645a..4a496cebe 100644
> --- a/tests/xmconfigdata/test-fullvirt-utc.xml
> +++ b/tests/xmconfigdata/test-fullvirt-utc.xml
> @@ -19,7 +19,7 @@
>     <on_reboot>restart</on_reboot>
>     <on_crash>restart</on_crash>
>     <devices>
> -    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='block' device='disk'>
>         <driver name='phy' type='raw'/>
>         <source dev='/dev/HostVG/XenGuest2'/>
> diff --git a/tests/xmconfigdata/test-no-source-cdrom.cfg b/tests/xmconfigdata/test-no-source-cdrom.cfg
> index 424042905..843996121 100644
> --- a/tests/xmconfigdata/test-no-source-cdrom.cfg
> +++ b/tests/xmconfigdata/test-no-source-cdrom.cfg
> @@ -12,7 +12,7 @@ localtime = 0
>   on_poweroff = "destroy"
>   on_reboot = "destroy"
>   on_crash = "destroy"
> -device_model = "/usr/lib/xen/bin/qemu-dm"
> +device_model = "/usr/lib/xen/bin/qemu-system-i386"
>   sdl = 0
>   vnc = 1
>   vncunused = 1
> diff --git a/tests/xmconfigdata/test-no-source-cdrom.xml b/tests/xmconfigdata/test-no-source-cdrom.xml
> index 5d0f3bd68..4a3915079 100644
> --- a/tests/xmconfigdata/test-no-source-cdrom.xml
> +++ b/tests/xmconfigdata/test-no-source-cdrom.xml
> @@ -19,7 +19,7 @@
>     <on_reboot>destroy</on_reboot>
>     <on_crash>destroy</on_crash>
>     <devices>
> -    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='block' device='disk'>
>         <driver name='phy' type='raw'/>
>         <source dev='/dev/sda8'/>
> diff --git a/tests/xmconfigdata/test-pci-devs.cfg b/tests/xmconfigdata/test-pci-devs.cfg
> index 1369b32bb..188227e18 100644
> --- a/tests/xmconfigdata/test-pci-devs.cfg
> +++ b/tests/xmconfigdata/test-pci-devs.cfg
> @@ -12,7 +12,7 @@ localtime = 0
>   on_poweroff = "destroy"
>   on_reboot = "destroy"
>   on_crash = "destroy"
> -device_model = "/usr/lib/xen/bin/qemu-dm"
> +device_model = "/usr/lib/xen/bin/qemu-system-i386"
>   sdl = 0
>   vnc = 1
>   vncunused = 1
> diff --git a/tests/xmconfigdata/test-pci-devs.xml b/tests/xmconfigdata/test-pci-devs.xml
> index f50e1947f..27f59c28b 100644
> --- a/tests/xmconfigdata/test-pci-devs.xml
> +++ b/tests/xmconfigdata/test-pci-devs.xml
> @@ -19,7 +19,7 @@
>     <on_reboot>destroy</on_reboot>
>     <on_crash>destroy</on_crash>
>     <devices>
> -    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
>       <disk type='block' device='disk'>
>         <driver name='phy' type='raw'/>
>         <source dev='/dev/sda8'/>
> 

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] tests: Xen: use qemu-system-i386 for emulator

Posted by Ján Tomko 22 weeks ago
On Wed, Apr 11, 2018 at 01:25:10PM -0600, Jim Fehlig wrote:
>Many of the old xm and sexpr test files used qemu-dm as the emulator.
>Modern Xen systems no longer use the old, forked qemu-dm, instead
>preferring the distro provided qemu or an "upstream" qemu that is
>built when the Xen tools are built. This qemu is typically installed
>in /usr/lib/xen/bin/qemu-system-i386.
>
>The libxl test files already use /usr/lib/xen/bin/qemu-system-i386.
>For consistency, change the old test files to use the same emulator
>
>Signed-off-by: Jim Fehlig <jfehlig@suse.com>
>---
>
>These config files can serve as examples too, so best not to
>encourage use of outdated/deprecated config.
>

Reviewed-by: J�n Tomko <jtomko@redhat.com>

Jano
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list