forked from pool/libvirt
9462ef6485
- util: improvements in error handling
09877303-virSocketAddrParseInternal.patch,
412afdb8-intro-virSocketAddrParseAny.patch
bsc#1080957
- Update to libvirt 4.2.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
6b3d716e-keycodemap-py3.patch,
33c6eb96-fix-libvirtd-reload-deadlock.patch,
464889ff-rpc-aquire-ref-dispatch.patch,
c6f1d519-rpc-simplify-dispatch.patch,
06e7ebb6-rpc-invoke-dispatch-unlocked.patch,
86cae503-rpc-fix-pre-exec.patch,
eefabb38-rpc-virtlockd-virtlogd-single-thread.patch,
fbf31e1a-CVE-2018-1064.patch,
fb327ac2-virtlockd-admin-socket.patch,
64370c4b-libxl-MigrateBegin.patch,
99486799-libxl-MigrateConfirm.patch,
f5eacf2a-libxl-MigratePerform.patch,
4e6fcdb6-libxl-libxlDomObjFromDomain-cleanup.patch,
fe51dbda-libxl-use-FindByRef.patch,
60b3fcd9-libxl-MigratePrepare.patch,
3c89868c-libxl-lock-after-ListRemove.patch,
13e81fc6-libxl-EndJob-on-error.patch,
594b8b99-libxl-DefineXMLFlags-API-pattern.patch,
c66e344e-libxl-dont-deref-NULL.patch,
83edaf44-libxl-dont-hardcode-sched-weight.patch,
apibuild-py3.patch
OBS-URL: https://build.opensuse.org/request/show/593871
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=683
27 lines
1.3 KiB
Diff
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.2.0/src/xenconfig/xen_sxpr.c
|
|
===================================================================
|
|
--- libvirt-4.2.0.orig/src/xenconfig/xen_sxpr.c
|
|
+++ libvirt-4.2.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
|