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>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.sexpr
index a18418a1775b4c11ff5d58f815078dc9c4138109..cdbbaedeefb5ecb0d698389f81237736ba387a18 100644 (file)
--- 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 8eaacc86d8819d0854032ce01d1a0060fb19bf97..cf6683feea8e21d68ea04de5f13a533a23dbf284 100644 (file)
--- 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 777f7e08b622b7f3180b6cfbe18b612964cd3dbd..1372025df3b4b2a49afdec48d5d24970379d3aea 100644 (file)
--- 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 8ed2261fc939b783d833d0789941a55d32621ed1..dd5b46a6a94cd4b86d9d5f7dd2506aa7fe4d4b35 100644 (file)
--- 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 04cd2aebf1d40d7ae91ca74a8822246d3f122174..8f31abf187a36f40352059e13c8bee6065994d2a 100644 (file)
--- 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 5e176bf91cb2562fa73f2f4ade1a124105946816..4c120674b5b6ce5c314f708fe65e521ba64fa9ff 100644 (file)
--- 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 bcb092650fc32ce19c79aca14494637c12db1b34..7fee66693e4c0fe1134a2e4c1c3dda2574d7edbf 100644 (file)
--- 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 8263011829fd216afd3b49b7c49f9a6a33a8f95d..5652e9a692507c40d35b968864788aeaa81c1fc4 100644 (file)
--- 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 549b2800c3efefd3c6a4fb7cf4ae6a8510d832b6..8bc6cfacfe1733c509201adcbf2d7024ea867ee1 100644 (file)
--- 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 4f2a39b804b0bd78f0aebea0e18381ab68f8fb77..659dcfd8a7e06c4a934aab5c28c4306951233af2 100644 (file)
--- 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 5616d19e39709bd1cf6d2bde92c4df3df89d6aba..6673aef55d577cc3dfbf85e7bc5fddd05ee1246f 100644 (file)
--- 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 2d390b52aa26041a92edd3f56dfdf3ddeed56f5d..d985afbf13283e6c2f742fce2cb7f4d31a9c8766 100644 (file)
--- 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 b0a344cb4998dca4b504a1512564c4f78cddda1e..3516e72a0438baa6450b8412f280d9dfe3da9d64 100644 (file)
--- 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 5edf0ce264b46b4f22d52f1c413e781d735c9d22..c15fe80a1bb825f5a8d8d647bc178bafa7f9c7f1 100644 (file)
--- 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 8d017263d6517e5b360119406c72359789ed32b3..6628452915d9df9a528478ddee29942d988dc2b0 100644 (file)
--- 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 eccab787bc598ebe9e4b8a7ed224bdd6f81d590f..2c4fd687a0238812ab75f615aab7b0f6d0acc9aa 100644 (file)
--- 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 8f5651813f359e80053a4c29686e6c13a85301dd..a8d08340acb8a00ee23c55c41a705c9006ba808d 100644 (file)
--- 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 79e9e69c38dff12e2b4fb3a345d0a67a35b58bc1..d72e503f8a4a14b094f51df603403ccc189f771d 100644 (file)
--- 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 f0b992526e3725e68df5a9ced00dbdc683458b31..d9e7336aed5b594260b2ff7014febb31797a718d 100644 (file)
--- 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 111db35b1751d8b3afbf4eb83949bde7d01c16d9..860d24e0553c4dd8deb2f9a47e63cb1c42e566b9 100644 (file)
--- 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 0eac5a4366fa2a0d63b8d9937ed5b4c46f08008c..b52a5e45538e16520ab43e205b7632219cb91da9 100644 (file)
--- 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 40d1c6e620c928b3fc19e5baf16d134734a12adb..c56e5432ce7e883cd530db175fedbc86e7df8448 100644 (file)
--- 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 a00410cd5310dde2c44db5cb21a779bddfdc5174..caf8b4a87c32f52a884accc69da6489a3c09363d 100644 (file)
--- 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 60d5d8e9ebe6ef9f3eb42242ea8063da767ecb59..0615bf4b34809912bd3da58ecc74cbb84dc2dba4 100644 (file)
--- 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 2b3a6610a77204fc8275497a378d69f2a391a9f0..be3e13cd766c3ae8752d31047db551617a278e98 100644 (file)
--- 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 55a4e9e0b569dcd95e81e88347fa87c4575a8400..00518e62f373f6e42e382c63838167cd9da8283e 100644 (file)
--- 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 1029c1a2579739d68b2904557f9230618f5e9a74..3ac68630c4deef0563ddf757420b8f9fb620c794 100644 (file)
--- 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 78ddea603483e5692171a070cca5e61e34bab308..e9d3c0e6a6501ecf1986af5f2150bd50e56bdf22 100644 (file)
--- 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 05a9a1d918d82f3e33aa4a1a8f66a85b75d5a2b0..e3eb554eaf48368e87a66f746c84d682931117b7 100644 (file)
--- 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 112830ac79b1fe742eb5868885e7b1411d685438..5cdcd25d9799e6e4d5c7a57bfc964d9454e5c966 100644 (file)
--- 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 0d80f8acaf6b51af539212a9c0af65789b96ca0c..8107efebbd105c1c7711377815a2f768f9c875e4 100644 (file)
--- 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 ab24504699a05481bbf56d386c381290e6a66472..8457f49f8c4918d77eae8073cf47be407575e4c0 100644 (file)
--- 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 44f2bfe8d1b3a9a0157949d71f9864d7bf6f01aa..32cb2ba071993426ab4e2a2c3fde54ecabec2797 100644 (file)
--- 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 b6afd9b3178471eabd0aac5f0ddffccb9aa17a92..973f8c1cdd43b33492fae2880e30f036e54e37c3 100644 (file)
--- 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 2efedf2e5ecabf154deaba7d8e466bc326dfe791..3eea3299596c972ea723e9f12f2229bcb96e9b3f 100644 (file)
--- 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 cdc05bc529ce36570097c989a501931a8a932056..2f14f17be51a8f80e87c6c2e23a24eb4ab5523da 100644 (file)
--- 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 356677e2cbf1fa296531d5c6f830245436109b36..aff06a67fcba4c364502923c73d13c9b6c282674 100644 (file)
--- 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 0fa40e95d24e8232105f4f6c0ff51b884faa2e31..c2f32144e76ede3079f9e1488ff46a8f680b1703 100644 (file)
--- 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 d99e13a7e9e4feda380bcbedc522242cfb1cd80e..6b0e822366662d29380929527e29df220ea4d428 100644 (file)
--- 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 def03321ad765c645bfdea4d6fbfd619b787ac0b..c2ea63f3b1b2a8ce68a9489084f6a24ca59f6b06 100644 (file)
--- 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 50d67154e21a40bfec97db4bfc6ce807234fdb5a..9552b9b7274431133e9459a827e076a0f8db7d63 100644 (file)
--- 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 def03321ad765c645bfdea4d6fbfd619b787ac0b..c2ea63f3b1b2a8ce68a9489084f6a24ca59f6b06 100644 (file)
--- 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 789082ef03785dacf4e41dc776f12c751dc93a6d..7a10c496b3c52500ced8ec09801eb450138cdc5b 100644 (file)
--- 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 ded0aa8537c3517d075db71ffacdfe6e6aceb0ba..1f919b8c0745bfa1d2133b30856307df4287634a 100644 (file)
--- 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 e2f77a167ef9a572129ab79276782b42b8deb3f1..3a2eec794a97e23a685460e2f57a0726818ad59f 100644 (file)
--- 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 48ce7cebf5f10c7bd75ad5de512eced03c971aaf..639517ee3a50d0b845f4ea21ff6a8847abd31425 100644 (file)
--- 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 7bfbfaec6ea8f367f89b81e9faba1804da05378d..09b7ecd8f6897828ed8cb84576142b4a7ec87074 100644 (file)
--- 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 1ae44a1d3487b8b56e32fb62897cad98d28283de..d281090c65378c3394d16cc56c2aff3abf96dd9f 100644 (file)
--- 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 92e807c65d915d3322d7398acb8e8521b71059a3..135b374c280689661f6aea122ed4ded1141768d9 100644 (file)
--- 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 1ae44a1d3487b8b56e32fb62897cad98d28283de..d281090c65378c3394d16cc56c2aff3abf96dd9f 100644 (file)
--- 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 dc4cbf59f731e319014d5ae657cc89da953d90f6..46794a5a13853391d5a908eaa82156f9de425bbb 100644 (file)
--- 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 1ae44a1d3487b8b56e32fb62897cad98d28283de..d281090c65378c3394d16cc56c2aff3abf96dd9f 100644 (file)
--- 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 f3e4901e4171a216ffaf18b72ea7c49bddc21e34..bd75f61900cc00ff185f19bbede36d7bcb864721 100644 (file)
--- 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 9753182944706976db5214655951cc90966b5c39..a02104d0df7ede47aaf63cc056a55daf2c1c4af2 100644 (file)
--- 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 e01ecb98449638cbc3a069768fde4511a1f12b21..b6511a96f3859b2b406bbd5c1ee9fa1301dfa617 100644 (file)
--- 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 f2d316c6f64d6ce77549587e91f29d263e5b1288..d9cb6569c5f78630d44727854ef4644449dc1e9a 100644 (file)
--- 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 c3ed8e8b9d1f2e7ffe20a170458bc80a6b7dd540..dbaa57632bb1adff37fda47b1cd00eddf6511d56 100644 (file)
--- 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 463d3598b8e660c15f3b4de45c9a5e91610efd47..77be06e94bec069f43ce4132e2be016b8d46a266 100644 (file)
--- 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 f13254edbd017dc186b79bdceb8f78362422680e..d3e410ffd204a677eb09cb18d95a19ee77c83029 100644 (file)
--- 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 712cc8679fbcb1c0a8e06532f7546b1bae7f3547..d95d34e0318e7a0f4aedab06ac2bca37a71ab4fa 100644 (file)
--- 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 f72575b53315607abbc4cedc33a13facd221ee44..b01e2902396db8ac1b4d6b9955bd6bebfb76ea04 100644 (file)
--- 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 b900ee0cfd1fff26a63fb033363f50ec1a9d5297..fdbba8a3af5a0e2e6b43ca430e9eb48beccd2018 100644 (file)
--- 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 d73b4e9f60fae19a2f0de6592db7db69d5fe0bbe..16fe985946f6e61ad456c653fb295f96492f839f 100644 (file)
--- 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 b900ee0cfd1fff26a63fb033363f50ec1a9d5297..fdbba8a3af5a0e2e6b43ca430e9eb48beccd2018 100644 (file)
--- 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 d670d36abaa72a9d25b9102b2093530b00d439a3..eb118427cc6a98a1d8eb4be671deccdfa011ccbf 100644 (file)
--- 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 fae684f21ed9222d7f20f019e9c3ecf7ef34eca6..e397a869ee7627ce21737966b2092b32379ba289 100644 (file)
--- 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 d51be217fe97e25fbe38101d2361a2f181e0da79..2f8514d5e487a423d53ed02d16482e81f7c9c6ca 100644 (file)
--- 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 ccb8f1a87379d1a2d2e0538b5ba2f77a79e133c4..0a42cfd2aa83d546efc95680686911c09cf18c28 100644 (file)
--- 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 254bd93b8ab05dd46ce98308b01a1708855524f9..b744b2184e04e918009dd9a0f428921162b770c0 100644 (file)
--- 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 cc5c6658f97c3a3e866e573997c56cd1cccab42f..f57d6eb5ca926637dbb07ff93284c5922a6ff27c 100644 (file)
--- 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 5e12c5e6cfa9b8061e46faeb1576bd69e1294379..f9fce015e05a3f18f2e633b8e4f56a4fd4a529ab 100644 (file)
--- 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 62253645aa7c120d85d83e1a02d222e9b16a5d56..4a496cebe389a01c172e53df560271152b8f9717 100644 (file)
--- 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 67e2511300d2887bb6f359249cfa02cfe7645393..e5375dfdb6b0bcc79d68cb32adee1eb91d7b811e 100644 (file)
--- 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 bbd177a116f969494899ff62f67349e0c0400792..d8ac37357460bd8b6a1e0d41dd30d769f6eed33f 100644 (file)
--- 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 df7b62133c2b00ffdc34972bf647e2b9dde96106..94c52d975b58cecb98a8ef2f711b3643215a9a05 100644 (file)
--- 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 f99e90979989ac98c4ecc2dbbe9d249e26cf07cd..d2cae8f98b50eccd0afac46f7676149ad0b1620c 100644 (file)
--- 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 d5bd759fb51fd78a162942ee0d12678106ffe3b0..9193cc8717c2bebe462151cdb2b1716c238ed8b3 100644 (file)
--- 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 ccaa761d887309b573fea6a93b7aac89676850be..4b2b432efd3af49e1978c2981d620a0a31c6069d 100644 (file)
--- 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 d38f0849be4c3efb2818629c6668cc719e3e1e05..9ef60b4bd570080beeab20c6d1c9ce968439def3 100644 (file)
--- 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 0010cf100eef4f77f9c505767a6343f3712b5cc7..c657139fdcf5b09350232373a3d81d7eeff64f95 100644 (file)
--- 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 9ed3fb78351f54ce3c947f5bc272c4aa17a2773b..60e41ab556df68701e20070197562d55b5d69423 100644 (file)
--- 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 a2ce6f2249de64929ecf8d59330f5776affe70e0..1cb8804bce93ed8ac1915e5f4070895447c84e7f 100644 (file)
--- 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 b055f7960e8fd9b29f4c7e0e8795711344435868..d4e0763d15624e618820eb820382a5a185d21fda 100644 (file)
--- 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 8485ae2163c791e0dbf9c41ad0426ea6d8cdc235..5dc5e2fa9aa645de76e1c5cfc68f420016bcc90a 100644 (file)
--- 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 5fb13cdd17b302358ba88c1e7f576f1136276e35..efefe109b958ce9e81f2cda2559f604d1040752a 100644 (file)
--- 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 5163e0f54f04c452122961b74fb6ecd0334187da..ece851585d233973001412fd5c3b3d9586d613f7 100644 (file)
--- 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 2c0f166fbc2becef141c7783ca10f21c9dff94f9..224f5274e1b54665cae9c68d80f236f12ef8493e 100644 (file)
--- 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 760e57df459a637ddd90f22fa25148321a373cd7..bd5317787f2e59df96d3fd21045f06784b6cf764 100644 (file)
--- 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 e90b3755b80522c119e4769e8cbd8d352f3dc633..e70ab847ecb37e828a5f09935f248a9661c159f1 100644 (file)
--- 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 517f9ddfb3d00aa4f6891961b5dd192622b53a6f..403bf68c052c02aa291ea4ea02bbac388518fd23 100644 (file)
--- 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 082215d6b27c81f5bd0274dbf51f255c1d31ea7e..9e7acdf0c419dae6a460d140fd5e66b238ead1bf 100644 (file)
--- 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 eee7365ae4d504188905a67aeb7831ce22878728..5f0b6c0d17f17a84af31a120549e5867cad53fa8 100644 (file)
--- 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 2912473ce39c640b1553082fa94b7ad05e79954b..964beba4fe44ed1eb9d5a779c26cca17c4d7cd60 100644 (file)
--- 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 1b0f5a6e9a34d143279fb629daaed8d08be8aa2e..6f6b1cf5b8dae440b21bf0aded3152574248c576 100644 (file)
--- 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 6747e699fe96e34aafa0e44529831b39528e2fff..501463f54cbf0b6d8b9c15ef485ab0a8cb40ec51 100644 (file)
--- 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 f13c920a56151ff1ca413a8a106a8863310a6732..0fbd9f6a469e4b6c42c94553c71b3bd676cb5fd4 100644 (file)
--- 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 c7eb1c1b4304e13d603e782f4c9366cd0adc5ba0..660f18e7767180a49e563cc24986ba133bb2cf44 100644 (file)
--- 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 2c855cd35f4e66a76c8bde41ad2b3e3a47afa4dc..244a42b5146bd165e9b6958b7e597eca7f84df15 100644 (file)
--- 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 23535eb70f0dca24f1639d13c8f2e2ac30c778e5..6dff15ebd7389c4057b4faa5277459a2ef718f6b 100644 (file)
--- 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 8921e7c9c945e8f2bd5271d9d545544ffd5e0839..90428882cc0562b03a9d427aca4faa100273f294 100644 (file)
--- 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 e82ffdca191fe84f25ef0a357ae1cd714cee32cf..e315f7e6588f9c5b34cf8d45bbcebbb09fd0716b 100644 (file)
--- 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 5e12c5e6cfa9b8061e46faeb1576bd69e1294379..f9fce015e05a3f18f2e633b8e4f56a4fd4a529ab 100644 (file)
--- 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 62253645aa7c120d85d83e1a02d222e9b16a5d56..4a496cebe389a01c172e53df560271152b8f9717 100644 (file)
--- 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 42404290500d8fa9739e4f4de91db73f4895f107..8439961215d63ff4561617d46b1f483a9902bed8 100644 (file)
--- 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 5d0f3bd68640fcaa964132bfd36de85273ba7d54..4a3915079508ffea7ce67d72e1b517ea3abd5d33 100644 (file)
--- 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 1369b32bb1472392e4130367aa1c1120bc8870db..188227e18793e1da1860782e9e77a4a1806df308 100644 (file)
--- 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 f50e1947ffec493cb45c1684b30f2c0094716523..27f59c28b00ee8b352a6314b2e8f33c7d90f5648 100644 (file)
--- 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'/>