libvirt/xen-sxpr-disk-type.patch
James Fehlig 87c18e30d4 Accepting request 508397 from home:jfehlig:branches:Virtualization
- Update to libvirt 3.5.0
  - Many incremental improvements and bug fixes, see
    http://libvirt.org/news.html
  - Dropped patches:
    5004f121-virFdStreamThread-dont-exceed-length.patch,
    1a4b21f1-set-EOF-on-end-of-stream.patch

OBS-URL: https://build.opensuse.org/request/show/508397
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=611
2017-07-05 19:26:04 +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.5.0/src/xenconfig/xen_sxpr.c
===================================================================
--- libvirt-3.5.0.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-3.5.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