forked from pool/libvirt
24511ba7f9
e4d131b8-mv-virDomainDefPostParseInternal.patch, 3e428670-post-parse-implicit-video.patch, 538012c8-default-vram.patch, 96b21fb0-vram-tests.patch, 400e716d-libxl-noprope-emulator.patch, b90c4b5f-tests-use-qemu-xen.patch bsc#979397 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=528
258 lines
11 KiB
Diff
258 lines
11 KiB
Diff
commit b90c4b5f505698d600303c5b4f03f5d229b329dd
|
|
Author: Jim Fehlig <jfehlig@suse.com>
|
|
Date: Thu May 12 14:40:29 2016 -0600
|
|
|
|
xlconfigtests: use qemu-xen in all test data files
|
|
|
|
Some of the test configuration files in tests/xlconfigdata
|
|
use the old qemu-dm as the emulator. Many of the configuration
|
|
features tested (spice, rbd, multi-usb) are not even usable with
|
|
the old qemu. Change these files to use the new qemu-xen (also
|
|
known as qemu upstream) emulator.
|
|
|
|
Note: This change fixes xlconfigtest failures when the old
|
|
qemu is actually installed on the system. During device post
|
|
parse, the libxl driver attempts to invoke the emulator to
|
|
determine if it is the old or new qemu so it can properly set
|
|
video RAM defaults. With the old qemu installed, the default
|
|
video RAM was set differently than the expected value.
|
|
Changing all the test data files to use qemu-xen ensures
|
|
predictable results wrt default video RAM size.
|
|
|
|
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
|
|
|
|
Index: libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-full.cfg
|
|
===================================================================
|
|
--- libvirt-1.3.4.orig/tests/xlconfigdata/test-disk-positional-parms-full.cfg
|
|
+++ libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-full.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
|
|
Index: libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-full.xml
|
|
===================================================================
|
|
--- libvirt-1.3.4.orig/tests/xlconfigdata/test-disk-positional-parms-full.xml
|
|
+++ libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-full.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'/>
|
|
Index: libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-partial.cfg
|
|
===================================================================
|
|
--- libvirt-1.3.4.orig/tests/xlconfigdata/test-disk-positional-parms-partial.cfg
|
|
+++ libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-partial.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
|
|
Index: libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-partial.xml
|
|
===================================================================
|
|
--- libvirt-1.3.4.orig/tests/xlconfigdata/test-disk-positional-parms-partial.xml
|
|
+++ libvirt-1.3.4/tests/xlconfigdata/test-disk-positional-parms-partial.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'/>
|
|
Index: libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-multiusb.cfg
|
|
===================================================================
|
|
--- libvirt-1.3.4.orig/tests/xlconfigdata/test-fullvirt-multiusb.cfg
|
|
+++ libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-multiusb.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
|
|
Index: libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-multiusb.xml
|
|
===================================================================
|
|
--- libvirt-1.3.4.orig/tests/xlconfigdata/test-fullvirt-multiusb.xml
|
|
+++ libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-multiusb.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'/>
|
|
Index: libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-nohap.cfg
|
|
===================================================================
|
|
--- libvirt-1.3.4.orig/tests/xlconfigdata/test-fullvirt-nohap.cfg
|
|
+++ libvirt-1.3.4/tests/xlconfigdata/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
|
|
Index: libvirt-1.3.4/tests/xlconfigdata/test-fullvirt-nohap.xml
|
|
===================================================================
|
|
--- libvirt-1.3.4.orig/tests/xlconfigdata/test-fullvirt-nohap.xml
|
|
+++ libvirt-1.3.4/tests/xlconfigdata/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'/>
|
|
Index: libvirt-1.3.4/tests/xlconfigdata/test-new-disk.cfg
|
|
===================================================================
|
|
--- libvirt-1.3.4.orig/tests/xlconfigdata/test-new-disk.cfg
|
|
+++ libvirt-1.3.4/tests/xlconfigdata/test-new-disk.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
|
|
Index: libvirt-1.3.4/tests/xlconfigdata/test-new-disk.xml
|
|
===================================================================
|
|
--- libvirt-1.3.4.orig/tests/xlconfigdata/test-new-disk.xml
|
|
+++ libvirt-1.3.4/tests/xlconfigdata/test-new-disk.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'/>
|
|
Index: libvirt-1.3.4/tests/xlconfigdata/test-rbd-multihost-noauth.cfg
|
|
===================================================================
|
|
--- libvirt-1.3.4.orig/tests/xlconfigdata/test-rbd-multihost-noauth.cfg
|
|
+++ libvirt-1.3.4/tests/xlconfigdata/test-rbd-multihost-noauth.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
|
|
Index: libvirt-1.3.4/tests/xlconfigdata/test-rbd-multihost-noauth.xml
|
|
===================================================================
|
|
--- libvirt-1.3.4.orig/tests/xlconfigdata/test-rbd-multihost-noauth.xml
|
|
+++ libvirt-1.3.4/tests/xlconfigdata/test-rbd-multihost-noauth.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'/>
|
|
Index: libvirt-1.3.4/tests/xlconfigdata/test-spice-features.cfg
|
|
===================================================================
|
|
--- libvirt-1.3.4.orig/tests/xlconfigdata/test-spice-features.cfg
|
|
+++ libvirt-1.3.4/tests/xlconfigdata/test-spice-features.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"
|
|
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
|
|
parallel = "none"
|
|
serial = "none"
|
|
Index: libvirt-1.3.4/tests/xlconfigdata/test-spice-features.xml
|
|
===================================================================
|
|
--- libvirt-1.3.4.orig/tests/xlconfigdata/test-spice-features.xml
|
|
+++ libvirt-1.3.4/tests/xlconfigdata/test-spice-features.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'/>
|
|
Index: libvirt-1.3.4/tests/xlconfigdata/test-spice.cfg
|
|
===================================================================
|
|
--- libvirt-1.3.4.orig/tests/xlconfigdata/test-spice.cfg
|
|
+++ libvirt-1.3.4/tests/xlconfigdata/test-spice.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"
|
|
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
|
|
parallel = "none"
|
|
serial = "none"
|
|
Index: libvirt-1.3.4/tests/xlconfigdata/test-spice.xml
|
|
===================================================================
|
|
--- libvirt-1.3.4.orig/tests/xlconfigdata/test-spice.xml
|
|
+++ libvirt-1.3.4/tests/xlconfigdata/test-spice.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'/>
|
|
Index: libvirt-1.3.4/tests/xlconfigdata/test-vif-rate.cfg
|
|
===================================================================
|
|
--- libvirt-1.3.4.orig/tests/xlconfigdata/test-vif-rate.cfg
|
|
+++ libvirt-1.3.4/tests/xlconfigdata/test-vif-rate.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
|
|
Index: libvirt-1.3.4/tests/xlconfigdata/test-vif-rate.xml
|
|
===================================================================
|
|
--- libvirt-1.3.4.orig/tests/xlconfigdata/test-vif-rate.xml
|
|
+++ libvirt-1.3.4/tests/xlconfigdata/test-vif-rate.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'/>
|