096d671ce7
- Update to libvirt 4.10.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
14d03b27-libxl-rm-redundant-virObjectEventStateQueue.patch,
82452a5d-libxl-rm-goto-libxlDomainShutdownThread.patch,
da4b0fd9-libxl-support-soft-reset.patch,
libxl-qemu-emulator-caps.patch
- Added patches:
libxl-support-ovswitch.patch,
libxl-ovswitch-config-format-conversions.patch
- FATE#320928, FATE#325817, FATE#326380, FATE#326698
OBS-URL: https://build.opensuse.org/request/show/653614
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=718
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-4.10.0/src/xenconfig/xen_sxpr.c
|
|
===================================================================
|
|
--- libvirt-4.10.0.orig/src/xenconfig/xen_sxpr.c
|
|
+++ libvirt-4.10.0/src/xenconfig/xen_sxpr.c
|
|
@@ -501,10 +501,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
|