forked from pool/libvirt
14c21278a9
- Update to libvirt 3.1.0 - Modularize storage driver by splitting it into backend-specific subpackages - CVE-2017-2635, bsc#1027075 - Many incremental improvements and bug fixes, see http://libvirt.org/news.html - Dropped patches: b018ada3-shunloadtest-build-fix.patch, f86a7a83-libxl-dom0-balloon-fix.patch, 6e4759d0-libxl-timer-fix.patch, 87df87e0-libxl-timer-tsc-emulate.patch, b4386fda-xenconfig-timer-fix.patch, d3970925-timer-tests.patch, 321a28c6-libxl-default-disk-format.patch, bd116810-libxl-fix-disk-detach.patch, ff225538-libxl-autoballoon-setting.patch, c89a6e78-libxl-physinfo-cleanup.patch, d2b77608-libxl-maxmem-fix.patch, 79692c38-libxl-dom0-maxmem.patch, 4ab0c959-libxl-mem-leak.patch, 2dc1cf19-libxl-double-free.patch, apparmor-errormsg-fix.patch, apparmor-alt-seclabel.patch, qemu-disable-namespaces.patch OBS-URL: https://build.opensuse.org/request/show/476767 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=588
27 lines
1.3 KiB
Diff
27 lines
1.3 KiB
Diff
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-3.1.0/src/xenconfig/xen_sxpr.c
|
|
===================================================================
|
|
--- libvirt-3.1.0.orig/src/xenconfig/xen_sxpr.c
|
|
+++ libvirt-3.1.0/src/xenconfig/xen_sxpr.c
|
|
@@ -506,10 +506,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
|