|
 |
860ffc |
From: Jim Fehlig <jfehlig@suse.com>
|
|
|
860ffc |
Date: Thu, 12 May 2016 14:40:29 -0600
|
|
|
860ffc |
Subject: [PATCH] xlconfigtests: use qemu-xen in all test data files
|
|
|
860ffc |
|
|
|
860ffc |
Some of the test configuration files in tests/xlconfigdata
|
|
|
860ffc |
use the old qemu-dm as the emulator. Many of the configuration
|
|
|
860ffc |
features tested (spice, rbd, multi-usb) are not even usable with
|
|
|
860ffc |
the old qemu. Change these files to use the new qemu-xen (also
|
|
|
860ffc |
known as qemu upstream) emulator.
|
|
|
860ffc |
|
|
|
860ffc |
Note: This change fixes xlconfigtest failures when the old
|
|
|
860ffc |
qemu is actually installed on the system. During device post
|
|
|
860ffc |
parse, the libxl driver attempts to invoke the emulator to
|
|
|
860ffc |
determine if it is the old or new qemu so it can properly set
|
|
|
860ffc |
video RAM defaults. With the old qemu installed, the default
|
|
|
860ffc |
video RAM was set differently than the expected value.
|
|
|
860ffc |
Changing all the test data files to use qemu-xen ensures
|
|
|
860ffc |
predictable results wrt default video RAM size.
|
|
|
860ffc |
|
|
|
860ffc |
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
|
|
|
860ffc |
(cherry picked from commit b90c4b5f505698d600303c5b4f03f5d229b329dd)
|
|
|
860ffc |
---
|
|
|
860ffc |
tests/xlconfigdata/test-disk-positional-parms-full.cfg | 2 +-
|
|
|
860ffc |
tests/xlconfigdata/test-disk-positional-parms-full.xml | 2 +-
|
|
|
860ffc |
tests/xlconfigdata/test-disk-positional-parms-partial.cfg | 2 +-
|
|
|
860ffc |
tests/xlconfigdata/test-disk-positional-parms-partial.xml | 2 +-
|
|
|
860ffc |
tests/xlconfigdata/test-fullvirt-multiusb.cfg | 2 +-
|
|
|
860ffc |
tests/xlconfigdata/test-fullvirt-multiusb.xml | 2 +-
|
|
|
860ffc |
tests/xlconfigdata/test-fullvirt-nohap.cfg | 2 +-
|
|
|
860ffc |
tests/xlconfigdata/test-fullvirt-nohap.xml | 2 +-
|
|
|
860ffc |
tests/xlconfigdata/test-new-disk.cfg | 2 +-
|
|
|
860ffc |
tests/xlconfigdata/test-new-disk.xml | 2 +-
|
|
|
860ffc |
tests/xlconfigdata/test-rbd-multihost-noauth.cfg | 2 +-
|
|
|
860ffc |
tests/xlconfigdata/test-rbd-multihost-noauth.xml | 2 +-
|
|
|
860ffc |
tests/xlconfigdata/test-spice-features.cfg | 2 +-
|
|
|
860ffc |
tests/xlconfigdata/test-spice-features.xml | 2 +-
|
|
|
860ffc |
tests/xlconfigdata/test-spice.cfg | 2 +-
|
|
|
860ffc |
tests/xlconfigdata/test-spice.xml | 2 +-
|
|
|
860ffc |
tests/xlconfigdata/test-vif-rate.cfg | 2 +-
|
|
|
860ffc |
tests/xlconfigdata/test-vif-rate.xml | 2 +-
|
|
|
860ffc |
18 files changed, 18 insertions(+), 18 deletions(-)
|
|
|
860ffc |
|
|
|
860ffc |
diff --git a/tests/xlconfigdata/test-disk-positional-parms-full.cfg b/tests/xlconfigdata/test-disk-positional-parms-full.cfg
|
|
|
860ffc |
index c5bbb03..217d4dc 100644
|
|
|
860ffc |
--- a/tests/xlconfigdata/test-disk-positional-parms-full.cfg
|
|
|
860ffc |
+++ b/tests/xlconfigdata/test-disk-positional-parms-full.cfg
|
|
|
860ffc |
@@ -12,7 +12,7 @@ localtime = 0
|
|
|
860ffc |
on_poweroff = "destroy"
|
|
|
860ffc |
on_reboot = "restart"
|
|
|
860ffc |
on_crash = "restart"
|
|
|
860ffc |
-device_model = "/usr/lib/xen/bin/qemu-dm"
|
|
|
860ffc |
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
|
|
|
860ffc |
sdl = 0
|
|
|
860ffc |
vnc = 1
|
|
|
860ffc |
vncunused = 1
|
|
|
860ffc |
diff --git a/tests/xlconfigdata/test-disk-positional-parms-full.xml b/tests/xlconfigdata/test-disk-positional-parms-full.xml
|
|
|
860ffc |
index 41e8804..1bc5b43 100644
|
|
|
860ffc |
--- a/tests/xlconfigdata/test-disk-positional-parms-full.xml
|
|
|
860ffc |
+++ b/tests/xlconfigdata/test-disk-positional-parms-full.xml
|
|
|
860ffc |
@@ -19,7 +19,7 @@
|
|
|
860ffc |
<on_reboot>restart</on_reboot>
|
|
|
860ffc |
<on_crash>restart</on_crash>
|
|
|
860ffc |
<devices>
|
|
|
860ffc |
- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
|
|
860ffc |
+ <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
|
|
|
860ffc |
<disk type='block' device='disk'>
|
|
|
860ffc |
<driver name='phy' type='raw'/>
|
|
|
860ffc |
<source dev='/dev/HostVG/XenGuest2'/>
|
|
|
860ffc |
diff --git a/tests/xlconfigdata/test-disk-positional-parms-partial.cfg b/tests/xlconfigdata/test-disk-positional-parms-partial.cfg
|
|
|
860ffc |
index 09eeb94..fd16db0 100644
|
|
|
860ffc |
--- a/tests/xlconfigdata/test-disk-positional-parms-partial.cfg
|
|
|
860ffc |
+++ b/tests/xlconfigdata/test-disk-positional-parms-partial.cfg
|
|
|
860ffc |
@@ -12,7 +12,7 @@ localtime = 0
|
|
|
860ffc |
on_poweroff = "destroy"
|
|
|
860ffc |
on_reboot = "restart"
|
|
|
860ffc |
on_crash = "restart"
|
|
|
860ffc |
-device_model = "/usr/lib/xen/bin/qemu-dm"
|
|
|
860ffc |
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
|
|
|
860ffc |
sdl = 0
|
|
|
860ffc |
vnc = 1
|
|
|
860ffc |
vncunused = 1
|
|
|
860ffc |
diff --git a/tests/xlconfigdata/test-disk-positional-parms-partial.xml b/tests/xlconfigdata/test-disk-positional-parms-partial.xml
|
|
|
860ffc |
index 6578e59..e86a5be 100644
|
|
|
860ffc |
--- a/tests/xlconfigdata/test-disk-positional-parms-partial.xml
|
|
|
860ffc |
+++ b/tests/xlconfigdata/test-disk-positional-parms-partial.xml
|
|
|
860ffc |
@@ -19,7 +19,7 @@
|
|
|
860ffc |
<on_reboot>restart</on_reboot>
|
|
|
860ffc |
<on_crash>restart</on_crash>
|
|
|
860ffc |
<devices>
|
|
|
860ffc |
- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
|
|
860ffc |
+ <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
|
|
|
860ffc |
<disk type='block' device='disk'>
|
|
|
860ffc |
<driver name='phy' type='raw'/>
|
|
|
860ffc |
<source dev='/dev/HostVG/XenGuest2'/>
|
|
|
860ffc |
diff --git a/tests/xlconfigdata/test-fullvirt-multiusb.cfg b/tests/xlconfigdata/test-fullvirt-multiusb.cfg
|
|
|
860ffc |
index 003eb2b..6d456de 100755
|
|
|
860ffc |
--- a/tests/xlconfigdata/test-fullvirt-multiusb.cfg
|
|
|
860ffc |
+++ b/tests/xlconfigdata/test-fullvirt-multiusb.cfg
|
|
|
860ffc |
@@ -12,7 +12,7 @@ localtime = 0
|
|
|
860ffc |
on_poweroff = "destroy"
|
|
|
860ffc |
on_reboot = "restart"
|
|
|
860ffc |
on_crash = "restart"
|
|
|
860ffc |
-device_model = "/usr/lib/xen/bin/qemu-dm"
|
|
|
860ffc |
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
|
|
|
860ffc |
sdl = 0
|
|
|
860ffc |
vnc = 1
|
|
|
860ffc |
vncunused = 1
|
|
|
860ffc |
diff --git a/tests/xlconfigdata/test-fullvirt-multiusb.xml b/tests/xlconfigdata/test-fullvirt-multiusb.xml
|
|
|
860ffc |
index d7df23a..fcd14e9 100644
|
|
|
860ffc |
--- a/tests/xlconfigdata/test-fullvirt-multiusb.xml
|
|
|
860ffc |
+++ b/tests/xlconfigdata/test-fullvirt-multiusb.xml
|
|
|
860ffc |
@@ -19,7 +19,7 @@
|
|
|
860ffc |
<on_reboot>restart</on_reboot>
|
|
|
860ffc |
<on_crash>restart</on_crash>
|
|
|
860ffc |
<devices>
|
|
|
860ffc |
- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
|
|
860ffc |
+ <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
|
|
|
860ffc |
<disk type='block' device='disk'>
|
|
|
860ffc |
<driver name='phy' type='raw'/>
|
|
|
860ffc |
<source dev='/dev/HostVG/XenGuest2'/>
|
|
|
860ffc |
diff --git a/tests/xlconfigdata/test-fullvirt-nohap.cfg b/tests/xlconfigdata/test-fullvirt-nohap.cfg
|
|
|
860ffc |
index 44bfa3c..e7e933d 100644
|
|
|
860ffc |
--- a/tests/xlconfigdata/test-fullvirt-nohap.cfg
|
|
|
860ffc |
+++ b/tests/xlconfigdata/test-fullvirt-nohap.cfg
|
|
|
860ffc |
@@ -13,7 +13,7 @@ localtime = 0
|
|
|
860ffc |
on_poweroff = "destroy"
|
|
|
860ffc |
on_reboot = "restart"
|
|
|
860ffc |
on_crash = "restart"
|
|
|
860ffc |
-device_model = "/usr/lib/xen/bin/qemu-dm"
|
|
|
860ffc |
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
|
|
|
860ffc |
sdl = 0
|
|
|
860ffc |
vnc = 1
|
|
|
860ffc |
vncunused = 1
|
|
|
860ffc |
diff --git a/tests/xlconfigdata/test-fullvirt-nohap.xml b/tests/xlconfigdata/test-fullvirt-nohap.xml
|
|
|
860ffc |
index 9cd7b0b..e57e28b 100644
|
|
|
860ffc |
--- a/tests/xlconfigdata/test-fullvirt-nohap.xml
|
|
|
860ffc |
+++ b/tests/xlconfigdata/test-fullvirt-nohap.xml
|
|
|
860ffc |
@@ -20,7 +20,7 @@
|
|
|
860ffc |
<on_reboot>restart</on_reboot>
|
|
|
860ffc |
<on_crash>restart</on_crash>
|
|
|
860ffc |
<devices>
|
|
|
860ffc |
- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
|
|
860ffc |
+ <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
|
|
|
860ffc |
<disk type='block' device='disk'>
|
|
|
860ffc |
<driver name='phy' type='raw'/>
|
|
|
860ffc |
<source dev='/dev/HostVG/XenGuest2'/>
|
|
|
860ffc |
diff --git a/tests/xlconfigdata/test-new-disk.cfg b/tests/xlconfigdata/test-new-disk.cfg
|
|
|
860ffc |
index b079056..4fe76b2 100644
|
|
|
860ffc |
--- a/tests/xlconfigdata/test-new-disk.cfg
|
|
|
860ffc |
+++ b/tests/xlconfigdata/test-new-disk.cfg
|
|
|
860ffc |
@@ -12,7 +12,7 @@ localtime = 0
|
|
|
860ffc |
on_poweroff = "destroy"
|
|
|
860ffc |
on_reboot = "restart"
|
|
|
860ffc |
on_crash = "restart"
|
|
|
860ffc |
-device_model = "/usr/lib/xen/bin/qemu-dm"
|
|
|
860ffc |
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
|
|
|
860ffc |
sdl = 0
|
|
|
860ffc |
vnc = 1
|
|
|
860ffc |
vncunused = 1
|
|
|
860ffc |
diff --git a/tests/xlconfigdata/test-new-disk.xml b/tests/xlconfigdata/test-new-disk.xml
|
|
|
860ffc |
index 41e8804..1bc5b43 100644
|
|
|
860ffc |
--- a/tests/xlconfigdata/test-new-disk.xml
|
|
|
860ffc |
+++ b/tests/xlconfigdata/test-new-disk.xml
|
|
|
860ffc |
@@ -19,7 +19,7 @@
|
|
|
860ffc |
<on_reboot>restart</on_reboot>
|
|
|
860ffc |
<on_crash>restart</on_crash>
|
|
|
860ffc |
<devices>
|
|
|
860ffc |
- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
|
|
860ffc |
+ <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
|
|
|
860ffc |
<disk type='block' device='disk'>
|
|
|
860ffc |
<driver name='phy' type='raw'/>
|
|
|
860ffc |
<source dev='/dev/HostVG/XenGuest2'/>
|
|
|
860ffc |
diff --git a/tests/xlconfigdata/test-rbd-multihost-noauth.cfg b/tests/xlconfigdata/test-rbd-multihost-noauth.cfg
|
|
|
860ffc |
index 99f0889..01c15d5 100644
|
|
|
860ffc |
--- a/tests/xlconfigdata/test-rbd-multihost-noauth.cfg
|
|
|
860ffc |
+++ b/tests/xlconfigdata/test-rbd-multihost-noauth.cfg
|
|
|
860ffc |
@@ -12,7 +12,7 @@ localtime = 0
|
|
|
860ffc |
on_poweroff = "destroy"
|
|
|
860ffc |
on_reboot = "restart"
|
|
|
860ffc |
on_crash = "restart"
|
|
|
860ffc |
-device_model = "/usr/lib/xen/bin/qemu-dm"
|
|
|
860ffc |
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
|
|
|
860ffc |
sdl = 0
|
|
|
860ffc |
vnc = 1
|
|
|
860ffc |
vncunused = 1
|
|
|
860ffc |
diff --git a/tests/xlconfigdata/test-rbd-multihost-noauth.xml b/tests/xlconfigdata/test-rbd-multihost-noauth.xml
|
|
|
860ffc |
index 728aa1e..ef9bd17 100644
|
|
|
860ffc |
--- a/tests/xlconfigdata/test-rbd-multihost-noauth.xml
|
|
|
860ffc |
+++ b/tests/xlconfigdata/test-rbd-multihost-noauth.xml
|
|
|
860ffc |
@@ -19,7 +19,7 @@
|
|
|
860ffc |
<on_reboot>restart</on_reboot>
|
|
|
860ffc |
<on_crash>restart</on_crash>
|
|
|
860ffc |
<devices>
|
|
|
860ffc |
- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
|
|
860ffc |
+ <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
|
|
|
860ffc |
<disk type='block' device='disk'>
|
|
|
860ffc |
<driver name='phy' type='raw'/>
|
|
|
860ffc |
<source dev='/dev/HostVG/XenGuest2'/>
|
|
|
860ffc |
diff --git a/tests/xlconfigdata/test-spice-features.cfg b/tests/xlconfigdata/test-spice-features.cfg
|
|
|
860ffc |
index 48dcd86..f8a25e4 100644
|
|
|
860ffc |
--- a/tests/xlconfigdata/test-spice-features.cfg
|
|
|
860ffc |
+++ b/tests/xlconfigdata/test-spice-features.cfg
|
|
|
860ffc |
@@ -12,7 +12,7 @@ localtime = 0
|
|
|
860ffc |
on_poweroff = "destroy"
|
|
|
860ffc |
on_reboot = "restart"
|
|
|
860ffc |
on_crash = "restart"
|
|
|
860ffc |
-device_model = "/usr/lib/xen/bin/qemu-dm"
|
|
|
860ffc |
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
|
|
|
860ffc |
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
|
|
|
860ffc |
parallel = "none"
|
|
|
860ffc |
serial = "none"
|
|
|
860ffc |
diff --git a/tests/xlconfigdata/test-spice-features.xml b/tests/xlconfigdata/test-spice-features.xml
|
|
|
860ffc |
index 3820732..8175760 100644
|
|
|
860ffc |
--- a/tests/xlconfigdata/test-spice-features.xml
|
|
|
860ffc |
+++ b/tests/xlconfigdata/test-spice-features.xml
|
|
|
860ffc |
@@ -19,7 +19,7 @@
|
|
|
860ffc |
<on_reboot>restart</on_reboot>
|
|
|
860ffc |
<on_crash>restart</on_crash>
|
|
|
860ffc |
<devices>
|
|
|
860ffc |
- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
|
|
860ffc |
+ <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
|
|
|
860ffc |
<disk type='block' device='disk'>
|
|
|
860ffc |
<driver name='phy' type='raw'/>
|
|
|
860ffc |
<source dev='/dev/HostVG/XenGuest2'/>
|
|
|
860ffc |
diff --git a/tests/xlconfigdata/test-spice.cfg b/tests/xlconfigdata/test-spice.cfg
|
|
|
860ffc |
index 7ab23e1..abdf63d 100644
|
|
|
860ffc |
--- a/tests/xlconfigdata/test-spice.cfg
|
|
|
860ffc |
+++ b/tests/xlconfigdata/test-spice.cfg
|
|
|
860ffc |
@@ -12,7 +12,7 @@ localtime = 0
|
|
|
860ffc |
on_poweroff = "destroy"
|
|
|
860ffc |
on_reboot = "restart"
|
|
|
860ffc |
on_crash = "restart"
|
|
|
860ffc |
-device_model = "/usr/lib/xen/bin/qemu-dm"
|
|
|
860ffc |
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
|
|
|
860ffc |
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
|
|
|
860ffc |
parallel = "none"
|
|
|
860ffc |
serial = "none"
|
|
|
860ffc |
diff --git a/tests/xlconfigdata/test-spice.xml b/tests/xlconfigdata/test-spice.xml
|
|
|
860ffc |
index f33691f..32cad27 100644
|
|
|
860ffc |
--- a/tests/xlconfigdata/test-spice.xml
|
|
|
860ffc |
+++ b/tests/xlconfigdata/test-spice.xml
|
|
|
860ffc |
@@ -19,7 +19,7 @@
|
|
|
860ffc |
<on_reboot>restart</on_reboot>
|
|
|
860ffc |
<on_crash>restart</on_crash>
|
|
|
860ffc |
<devices>
|
|
|
860ffc |
- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
|
|
860ffc |
+ <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
|
|
|
860ffc |
<disk type='block' device='disk'>
|
|
|
860ffc |
<driver name='phy' type='raw'/>
|
|
|
860ffc |
<source dev='/dev/HostVG/XenGuest2'/>
|
|
|
860ffc |
diff --git a/tests/xlconfigdata/test-vif-rate.cfg b/tests/xlconfigdata/test-vif-rate.cfg
|
|
|
860ffc |
index db932e5..34a19a2 100644
|
|
|
860ffc |
--- a/tests/xlconfigdata/test-vif-rate.cfg
|
|
|
860ffc |
+++ b/tests/xlconfigdata/test-vif-rate.cfg
|
|
|
860ffc |
@@ -12,7 +12,7 @@ localtime = 0
|
|
|
860ffc |
on_poweroff = "destroy"
|
|
|
860ffc |
on_reboot = "restart"
|
|
|
860ffc |
on_crash = "restart"
|
|
|
860ffc |
-device_model = "/usr/lib/xen/bin/qemu-dm"
|
|
|
860ffc |
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
|
|
|
860ffc |
sdl = 0
|
|
|
860ffc |
vnc = 1
|
|
|
860ffc |
vncunused = 1
|
|
|
860ffc |
diff --git a/tests/xlconfigdata/test-vif-rate.xml b/tests/xlconfigdata/test-vif-rate.xml
|
|
|
860ffc |
index 3620e2a..3ab7488 100644
|
|
|
860ffc |
--- a/tests/xlconfigdata/test-vif-rate.xml
|
|
|
860ffc |
+++ b/tests/xlconfigdata/test-vif-rate.xml
|
|
|
860ffc |
@@ -19,7 +19,7 @@
|
|
|
860ffc |
<on_reboot>restart</on_reboot>
|
|
|
860ffc |
<on_crash>restart</on_crash>
|
|
|
860ffc |
<devices>
|
|
|
860ffc |
- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
|
|
860ffc |
+ <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
|
|
|
860ffc |
<disk type='block' device='disk'>
|
|
|
860ffc |
<driver name='phy' type='raw'/>
|
|
|
860ffc |
<source dev='/dev/HostVG/XenGuest2'/>
|