libvirt/xen-sxpr-disk-type.patch
James Fehlig 7fe9d077c7 Accepting request 681981 from home:jfehlig:branches:Virtualization
- Update to libvirt 5.1.0
  - Many incremental improvements and bug fixes, see
    http://libvirt.org/news.html
  - Dropped patches:
    11c8aca9-libxl-set-mem-after-balloon.patch,
    70c2933d-apparmor-named-profiles.patch,
    a3ab6d42-apparmor-conv-libvirtd-named-profile.patch,
    b6440119-qemu-conf-sev.patch,
    a404ac34-qemu-cgroup-sev.patch,
    6fd4c8f8-qemu-domain-sev.patch,
    17f6a257-security-dac-sev.patch,
    a2d3dea9-qemu-caps-dac-override-sev.patch,
    620d9dd5-qemu-no-dac-override-nonroot.patch
  - jsc#SLE-3887, jsc#SLE-4480, jsc#SLE-4577

OBS-URL: https://build.opensuse.org/request/show/681981
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=734
2019-03-06 02:00:59 +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-5.1.0/src/xenconfig/xen_sxpr.c
===================================================================
--- libvirt-5.1.0.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-5.1.0/src/xenconfig/xen_sxpr.c
@@ -497,10 +497,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