9ccf0d308b
- Update to libvirt 5.3.0 - Many incremental improvements and bug fixes, see http://libvirt.org/news.html - Dropped patches: ff376c62-tests-fix-mocking-stat-lstat.patch, ebe9c6ea-qemu-firmware-dirent.patch, 2a07c990-api-CVE-2019-3886.patch, ae076bb4-remote-CVE-2019-3886.patch, f66f70ac-snapshot-fix-use-after-free.patch, 89237d53-conf-expose-virDomainSCSIDriveAddressIsUsed.patch, ee2c5ef3-test-scsi-disk.patch, ddc72f99-qemu-check-dup-drive-address.patch, 22dc3e94-revert-f1d65853.patch OBS-URL: https://build.opensuse.org/request/show/701641 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=752
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-5.3.0/src/xenconfig/xen_sxpr.c
|
|
===================================================================
|
|
--- libvirt-5.3.0.orig/src/xenconfig/xen_sxpr.c
|
|
+++ libvirt-5.3.0/src/xenconfig/xen_sxpr.c
|
|
@@ -497,10 +497,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
|