libvirt/xen-sxpr-disk-type.patch
James Fehlig 2aa2eef142 Accepting request 500763 from home:jfehlig:branches:Virtualization
-  Update to libvirt 3.4.0
  - Many incremental improvements and bug fixes, see
    http://libvirt.org/news.html
  - Dropped patches:
    aeda1b8c-qemu-no-error-shutdown.patch,
    8023b21a-conf-ioapic.patch, 6b5c6314-qemu-irqchip.patch,
    2020e2c6-conf-intremap.patch, 04028a9d-qemu-intremap.patch,
    d12781b4-conf-iommu-cache-mode-attr.patch,
    a5691448-qemu-iommu-cache-mode.patch,
    3a276c65-conf-iommu-def-stability-check.patch,
    935d927a-conf-iommu-ABI-stability-check.patch,
    4cd3f241-fix-NULL-disk-source.patch,
    975ea20f-loopback-macro.patch,
    dbb85e0c-libxl-graphics-listen-addr.patch,
    libxl-def-usbctrl.patch, revert-2841e675-mtu.patch
  - FATE#321335, bsc#1031056, bsc#1037774, bsc#1040207, bsc#1040213

OBS-URL: https://build.opensuse.org/request/show/500763
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=606
2017-06-02 18:08:28 +00:00

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.4.0/src/xenconfig/xen_sxpr.c
===================================================================
--- libvirt-3.4.0.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-3.4.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