libvirt/xen-sxpr-disk-type.patch
James Fehlig 938f073a9b Accepting request 349565 from home:jfehlig:branches:Virtualization
- CVE-2015-5313: don't allow '/' in filesystem volume names
  034e47c3-CVE-2015-5313.patch
  bsc#953110
- Fix failing qemuxml2argv test on 32-bit platforms
  ace1ee22-qemuxml2argv-test.patch

- Update to libvirt 1.3.0
  - New virtlogd log daemon
  - Many incremental improvements and bug fixes, see
    http://libvirt.org/news.html
  - Dropped patch: 703ec1b7-qemu-bridge-helper-fix.patch
  - Added patch: virtlogd-init-script.patch

OBS-URL: https://build.opensuse.org/request/show/349565
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=505
2015-12-18 21:01:20 +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-1.3.0/src/xenconfig/xen_sxpr.c
===================================================================
--- libvirt-1.3.0.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-1.3.0/src/xenconfig/xen_sxpr.c
@@ -449,10 +449,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