SHA256
1
0
forked from pool/libvirt
libvirt/xen-sxpr-disk-type.patch
James Fehlig 4d2c547eb1 Accepting request 614408 from home:jfehlig:branches:Virtualization
- spec: use wireshark plugin directory from pkg-config

- virt-aa-helper: add SUSE path to OVMF and AAVMF images
  Adjusted suse-ovmf-paths.patch
  boo#1095556

- Update to libvirt 4.4.0
  - Many incremental improvements and bug fixes, see
    http://libvirt.org/news.html
  - CVE-2018-3639
  - Dropped patches:
    1dbca2ec-CVE-2018-3639.patch, 92673422-CVE-2018-3639.patch
- libxl: fix leaking logfile fds
  67c56f6e-libxl-logfd-leak-fix.patch
  bsc#1094480

OBS-URL: https://build.opensuse.org/request/show/614408
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=691
2018-06-05 23:59:32 +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-4.4.0/src/xenconfig/xen_sxpr.c
===================================================================
--- libvirt-4.4.0.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-4.4.0/src/xenconfig/xen_sxpr.c
@@ -501,10 +501,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