2015-10-13 19:02:37 +02:00
|
|
|
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
|
|
|
|
|
|
Accepting request 583090 from home:jfehlig:branches:Virtualization
- Update to libvirt 4.1.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
72adaf2f-revert-qemu-monitor-error-report.patch,
71d56a39-nodedev-fix-parse-PCI-address.patch,
68eed56b-conf-smbios-oem-strings.patch,
76977061-qemu-smbios-oem-strings.patch,
0c710a37-libxl-resume-lock-on-mig-failure.patch,
759b4d1b-virlog-determine-the-hostname-on-startup-CVE-2018-67.patch,
c2dc6698-fix-deadlock-obtaining-hostname.patch,
c391e07e-libxl-clock-settings.patch,
ef71caea-libxl-memalign.patch,
suse-apparmor-signal.patch
OBS-URL: https://build.opensuse.org/request/show/583090
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=674
2018-03-05 18:46:32 +01:00
|
|
|
Index: libvirt-4.1.0/src/xenconfig/xen_sxpr.c
|
2015-10-13 19:02:37 +02:00
|
|
|
===================================================================
|
Accepting request 583090 from home:jfehlig:branches:Virtualization
- Update to libvirt 4.1.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
72adaf2f-revert-qemu-monitor-error-report.patch,
71d56a39-nodedev-fix-parse-PCI-address.patch,
68eed56b-conf-smbios-oem-strings.patch,
76977061-qemu-smbios-oem-strings.patch,
0c710a37-libxl-resume-lock-on-mig-failure.patch,
759b4d1b-virlog-determine-the-hostname-on-startup-CVE-2018-67.patch,
c2dc6698-fix-deadlock-obtaining-hostname.patch,
c391e07e-libxl-clock-settings.patch,
ef71caea-libxl-memalign.patch,
suse-apparmor-signal.patch
OBS-URL: https://build.opensuse.org/request/show/583090
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=674
2018-03-05 18:46:32 +01:00
|
|
|
--- libvirt-4.1.0.orig/src/xenconfig/xen_sxpr.c
|
|
|
|
|
+++ libvirt-4.1.0/src/xenconfig/xen_sxpr.c
|
2017-11-02 23:48:50 +01:00
|
|
|
@@ -501,10 +501,11 @@ xenParseSxprDisks(virDomainDefPtr def,
|
2015-10-13 19:02:37 +02:00
|
|
|
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
|
