forked from pool/libvirt
fe8f4e8203
- Update to libvirt 1.3.1
- CVE-2015-5313
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches: 034e47c3-CVE-2015-5313.patch,
ace1ee22-qemuxml2argv-test.patch, add-with-login-shell.patch,
virt-aa-helper-rw-mounts.patch
OBS-URL: https://build.opensuse.org/request/show/354651
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=508
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-1.3.1/src/xenconfig/xen_sxpr.c
|
|
===================================================================
|
|
--- libvirt-1.3.1.orig/src/xenconfig/xen_sxpr.c
|
|
+++ libvirt-1.3.1/src/xenconfig/xen_sxpr.c
|
|
@@ -504,10 +504,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
|