rpm/libvirt
SHA256
1
0
Fork 0
forked from pool/libvirt
Code Pull Requests Activity

Add an old SLE12 bug fix to Factory/Tumbleweed

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=494
This commit is contained in:
James Fehlig 2015-10-13 17:02:37 +00:00 committed by Git OBS Bridge
parent 5735dde32d
commit d1058d1ec0
3 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libvirt.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Oct 13 15:13:38 UTC 2015 - jfehlig@suse.com
- xenconfig: set disk type to BLOCK when driver is not tap or file
xen-sxpr-disk-type.patch
bsc#938228
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 9 17:11:14 UTC 2015 - jfehlig@suse.com Fri Oct 9 17:11:14 UTC 2015 - jfehlig@suse.com

10
libvirt.spec
View File

@ -461,11 +461,12 @@ Patch203: virtlockd-init-script.patch
Patch204: suse-qemu-conf.patch Patch204: suse-qemu-conf.patch
Patch205: support-managed-pci-xen-driver.patch Patch205: support-managed-pci-xen-driver.patch
Patch206: systemd-service-xen.patch Patch206: systemd-service-xen.patch
Patch207: xen-sxpr-disk-type.patch
# Disable failing virCgroupGetPercpuStats unit test # Disable failing virCgroupGetPercpuStats unit test
Patch207: disable-virCgroupGetPercpuStats-test.patch Patch208: disable-virCgroupGetPercpuStats-test.patch
Patch208: apparmor-no-mount.patch Patch209: apparmor-no-mount.patch
Patch209: qemu-apparmor-screenshot.patch Patch210: qemu-apparmor-screenshot.patch
Patch210: libvirt-suse-netcontrol.patch Patch211: libvirt-suse-netcontrol.patch
# SocketUser and SocketGroup settings were added to systemd.socket in # SocketUser and SocketGroup settings were added to systemd.socket in
# version 214. Patch the setting away in earlier systemd # version 214. Patch the setting away in earlier systemd
%if 0%{systemd_version} < 214 %if 0%{systemd_version} < 214
@ -993,6 +994,7 @@ Provides a dissector for the libvirt RPC protocol to help debugging it.
%patch208 -p1 %patch208 -p1
%patch209 -p1 %patch209 -p1
%patch210 -p1 %patch210 -p1
%patch211 -p1
%if 0%{systemd_version} < 214 %if 0%{systemd_version} < 214
%patch300 -p1 %patch300 -p1
%endif %endif

26
xen-sxpr-disk-type.patch Normal file
View File

@ -0,0 +1,26 @@
xen_sxpr: set disk type to BLOCK when driver is not tap or file
When parsing disk s-expression to virDomainDiskDef structure, explicitly
set type to VIR_STORAGE_TYPE_BLOCK for all drivers except 'tap', 'tap2',
and 'file'. This was implicitly done prior to commit 9673418c.
https://bugzilla.suse.com/show_bug.cgi?id=938228
Index: libvirt-1.2.20/src/xenconfig/xen_sxpr.c
===================================================================
--- libvirt-1.2.20.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-1.2.20/src/xenconfig/xen_sxpr.c
@@ -449,10 +449,11 @@ xenParseSxprDisks(virDomainDefPtr def,
omnipotent, we can revisit this, perhaps stat()'ing
the src file in question */
virDomainDiskSetType(disk, VIR_STORAGE_TYPE_FILE);
- } else if (STREQ(virDomainDiskGetDriver(disk), "phy")) {
- virDomainDiskSetType(disk, VIR_STORAGE_TYPE_BLOCK);
} else if (STREQ(virDomainDiskGetDriver(disk), "file")) {
virDomainDiskSetType(disk, VIR_STORAGE_TYPE_FILE);
+ } else {
+ /* Set type to BLOCK for drivers != {tap,tap2,file} */
+ virDomainDiskSetType(disk, VIR_STORAGE_TYPE_BLOCK);
}
} else {
/* No CDROM media so can't really tell. We'll just