0d01ad3986
- Update to libvirt 3.6.0 - Many incremental improvements and bug fixes, see http://libvirt.org/news.html - Fix unit tests on s390x and ppc64 8982f3ab-util-hash-header.patch, 0b1ecf7b-virHashCodeGen-mockable.patch. f536b0dd-tests-arch-independent-hash.patch - Patch cleanup - Renamed libvirtd-defaults.patch to suse-libvirtd-disable-tls.patch - Renamed libvirtd-init-script.patch to suse-libvirtd-sysconfig-settings.patch - Renamed virtlockd-init-script.patch to suse-virtlockd-sysconfig-settings.patch - Renamed virtlogd-init-script.patch to suse-virtlogd-sysconfig-settings.patch - Renamed libvirt-guests-init-script.patch to suse-libvirt-guests-service.patch - Combined suse-libvirtd-service.patch and systemd-service-xen.patch to suse-libvirtd-service-xen.patch since both patches add Xen support to libvirtd service file - Pull OVMF-related changes from suse-qemu-conf.patch into a new suse-ovmf-paths.patch - Add a supportconfig plugin libvirt-supportconfig FATE#323661 OBS-URL: https://build.opensuse.org/request/show/514264 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=615
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.6.0/src/xenconfig/xen_sxpr.c
|
|
===================================================================
|
|
--- libvirt-3.6.0.orig/src/xenconfig/xen_sxpr.c
|
|
+++ libvirt-3.6.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
|