forked from pool/libvirt
4d273a1174
- Update to libvirt 5.4.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
5cd9db3a-cputest-add-data-E3-1225-v5.patch,
538d8735-cpu_map-Define-md-clear-CPUID-bit.patch,
96f41cd7-admin-reject-clients.patch,
f111e094-locking-restrict-sockets-to-mode-0600.patch,
e37bd65f-logging-restrict-sockets-to-mode-0600.patch,
76b420d0-build-libqemutestdriver-lto-fix.patch
OBS-URL: https://build.opensuse.org/request/show/707328
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=762
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-5.4.0/src/libxl/libxl_conf.c
|
|
===================================================================
|
|
--- libvirt-5.4.0.orig/src/libxl/libxl_conf.c
|
|
+++ libvirt-5.4.0/src/libxl/libxl_conf.c
|
|
@@ -897,6 +897,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)
|
|
{
|
|
@@ -1041,6 +1060,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);
|
|
@@ -1056,7 +1076,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;
|
|
}
|
|
|
|
@@ -1169,6 +1189,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;
|