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 567780 from home:jfehlig:branches:Virtualization
- Update to libvirt 4.0.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
2d07f1f0-fix-storage-crash.patch,
69ed99c7-dom0-persistent.patch,
8599aedd-libvirt-guests-dom0-filter.patch,
0f33025a-virt-aa-helper-handle-more-disk-images.patch,
b475a91b-add-virStringFilterChars-string-utility.patch,
faec1958-lxc-set-hostname-based-on-container-name.patch,
2089ab21-netserver-close-clients-before-stopping-all-drivers.patch,
fix-virt-aa-helper-profile.patch,
suse-apparmor-signal.patch
- Patches added to fix upstream bugs:
72adaf2f-revert-qemu-monitor-error-report.patch,
71d56a39-nodedev-fix-parse-PCI-address.patch
- CVE-2018-5748, CVE-2017-5715, bsc#1071651
OBS-URL: https://build.opensuse.org/request/show/567780
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=661
2018-01-19 20:16:17 +01:00
|
|
|
Index: libvirt-4.0.0/src/xenconfig/xen_sxpr.c
|
2015-10-13 19:02:37 +02:00
|
|
|
===================================================================
|
Accepting request 567780 from home:jfehlig:branches:Virtualization
- Update to libvirt 4.0.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
2d07f1f0-fix-storage-crash.patch,
69ed99c7-dom0-persistent.patch,
8599aedd-libvirt-guests-dom0-filter.patch,
0f33025a-virt-aa-helper-handle-more-disk-images.patch,
b475a91b-add-virStringFilterChars-string-utility.patch,
faec1958-lxc-set-hostname-based-on-container-name.patch,
2089ab21-netserver-close-clients-before-stopping-all-drivers.patch,
fix-virt-aa-helper-profile.patch,
suse-apparmor-signal.patch
- Patches added to fix upstream bugs:
72adaf2f-revert-qemu-monitor-error-report.patch,
71d56a39-nodedev-fix-parse-PCI-address.patch
- CVE-2018-5748, CVE-2017-5715, bsc#1071651
OBS-URL: https://build.opensuse.org/request/show/567780
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=661
2018-01-19 20:16:17 +01:00
|
|
|
--- libvirt-4.0.0.orig/src/xenconfig/xen_sxpr.c
|
|
|
|
|
+++ libvirt-4.0.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
|
