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
67 lines
2.3 KiB
Diff
67 lines
2.3 KiB
Diff
libxl: set script field of libxl_device_disk
|
|
|
|
Add a hack to the libvirt libxl driver to set
|
|
libxl_device_disk->script when the disk configuration starts
|
|
with some well-known Xen external block scripts: dmmd, drbd,
|
|
and npiv.
|
|
|
|
For more details, see bsc#954872 and FATE#319810
|
|
|
|
Index: libvirt-4.2.0/src/libxl/libxl_conf.c
|
|
===================================================================
|
|
--- libvirt-4.2.0.orig/src/libxl/libxl_conf.c
|
|
+++ libvirt-4.2.0/src/libxl/libxl_conf.c
|
|
@@ -771,6 +771,25 @@ libxlDiskSetDiscard(libxl_device_disk *x
|
|
#endif
|
|
}
|
|
|
|
+static int
|
|
+libxlDiskSetScript(libxl_device_disk *x_disk, const char *disk_spec)
|
|
+{
|
|
+ if (disk_spec == NULL)
|
|
+ return 0;
|
|
+
|
|
+ if (STRPREFIX(disk_spec, "dmmd:")) {
|
|
+ if (VIR_STRDUP(x_disk->script, "block-dmmd") < 0)
|
|
+ return -1;
|
|
+ } else if (STRPREFIX(disk_spec, "drbd:")) {
|
|
+ if (VIR_STRDUP(x_disk->script, "block-drbd") < 0)
|
|
+ return -1;
|
|
+ } else if (STRPREFIX(disk_spec, "npiv:")) {
|
|
+ if (VIR_STRDUP(x_disk->script, "block-npiv") < 0)
|
|
+ return -1;
|
|
+ }
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static void
|
|
libxlDiskSetCacheMode(libxl_device_disk *x_disk, int cachemode)
|
|
{
|
|
@@ -916,6 +935,7 @@ libxlMakeNetworkDiskSrc(virStorageSource
|
|
int
|
|
libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk)
|
|
{
|
|
+ const char *src = virDomainDiskGetSource(l_disk);
|
|
const char *driver = virDomainDiskGetDriver(l_disk);
|
|
int format = virDomainDiskGetFormat(l_disk);
|
|
int actual_type = virStorageSourceGetActualType(l_disk->src);
|
|
@@ -931,7 +951,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
|
|
if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0)
|
|
return -1;
|
|
} else {
|
|
- if (VIR_STRDUP(x_disk->pdev_path, virDomainDiskGetSource(l_disk)) < 0)
|
|
+ if (VIR_STRDUP(x_disk->pdev_path, src) < 0)
|
|
return -1;
|
|
}
|
|
|
|
@@ -1044,6 +1064,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
|
|
if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0)
|
|
return -1;
|
|
libxlDiskSetCacheMode(x_disk, l_disk->cachemode);
|
|
+ if (libxlDiskSetScript(x_disk, src) < 0)
|
|
+ return -1;
|
|
+
|
|
/* An empty CDROM must have the empty format, otherwise libxl fails. */
|
|
if (x_disk->is_cdrom && !x_disk->pdev_path)
|
|
x_disk->format = LIBXL_DISK_FORMAT_EMPTY;
|