tests: Xen: use qemu-system-i386 for emulator

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> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2024-12-22 05:35:25 +00:00 · 2018-04-11 10:38:14 -06:00 · 2018-04-11 10:38:14 -06:00 · cec1022e01
commit cec1022e01
parent 3c66d5108f
107 changed files with 107 additions and 107 deletions
--- 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)
--- 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'/>
--- 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')\
--- 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'/>
--- 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')))\
--- 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'/>
--- 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')))\
--- 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'/>
--- 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)
--- 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'/>
--- 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')))\
--- 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'/>
--- 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')\
--- 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'/>
--- 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')\
--- 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'/>
--- 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')\
--- 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'/>
--- 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')))\
--- 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'/>
--- 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')\
--- 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'/>
--- 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')\
--- 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'/>
--- 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')\
--- 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'/>
--- 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')))\
--- 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'/>
--- 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')\
--- 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'/>
--- 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')\
--- 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'/>
--- 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')\
--- 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'/>
--- 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')\
--- 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'/>
--- 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')\
--- 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'/>
--- 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')\
--- 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'/>
--- 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')))\
--- 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'/>
--- 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')))\
--- 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'/>
--- 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')))\
--- 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'/>
--- 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')\
--- 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'/>
--- 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')\
--- 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'/>
--- 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')\
--- 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'/>
--- 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)
--- 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'/>
--- 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'
--- 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'/>
--- 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')\
--- 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'/>
--- 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
--- 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'/>
--- 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
--- 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'/>
--- 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
--- 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'/>
--- 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
--- 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'/>
--- 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
--- 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'/>
--- 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
--- 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'/>
--- 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
--- 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'/>
--- 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
--- 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'/>
--- 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
--- 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'/>
--- 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
--- 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'/>
--- 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
--- 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'/>
--- 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
--- 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'/>
--- 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
--- 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'/>
--- 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
--- 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'/>
--- 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
--- 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'/>
--- 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
--- 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'/>
--- 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
--- 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'/>
--- 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
--- 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'/>
--- 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
--- 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'/>
--- 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
--- 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'/>
--- 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'/>
--- 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
--- a/Show More
+++ b/Show More