libvirt/libxl-support-block-script.patch
James Fehlig b495b9f65b Accepting request 831542 from home:jfehlig:branches:Virtualization
- spec: Enable the same hypervisor drivers for openSUSE and SLE
  jsc#SLE-11772
- spec: Enable the same storage drivers for openSUSE and SLE
  jsc#SLE-11877

- qemu: Reprobe capabilities if the qemu modules directory changes
  2ad009ea-qemu-check-modules-dir.patch
  boo#1175320

- Update to libvirt 6.7.0
  - jsc#SLE-14253, jsc#SLE-15159
  - CVE-2020-14339
  - Many incremental improvements and bug fixes, see
    https://libvirt.org/news.html
  - Dropped patches:
    2edd63a0-fix-virFileSetCOW-logic.patch,
    82bb167f-dont-cache-devmapper-major.patch,
    feb8564a-handle-no-devmapper.patch,
    53d9af1e-ignore-devmapper-open-errors.patch,
    support-managed-pci-xen-driver.patch,
    disable-multipath-pr-tests.patch

OBS-URL: https://build.opensuse.org/request/show/831542
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=840
2020-09-02 22:47:08 +00:00

64 lines
2.2 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-6.7.0/src/libxl/libxl_conf.c
===================================================================
--- libvirt-6.7.0.orig/src/libxl/libxl_conf.c
+++ libvirt-6.7.0/src/libxl/libxl_conf.c
@@ -912,6 +912,22 @@ 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:"))
+ x_disk->script = g_strdup("block-dmmd");
+ else if (STRPREFIX(disk_spec, "drbd:"))
+ x_disk->script = g_strdup("block-drbd");
+ else if (STRPREFIX(disk_spec, "npiv:"))
+ x_disk->script = g_strdup("block-npiv");
+
+ return 0;
+}
+
static void
libxlDiskSetCacheMode(libxl_device_disk *x_disk, int cachemode)
{
@@ -1048,6 +1064,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);
@@ -1063,7 +1080,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0)
return -1;
} else {
- x_disk->pdev_path = g_strdup(virDomainDiskGetSource(l_disk));
+ x_disk->pdev_path = g_strdup(src);
}
x_disk->vdev = g_strdup(l_disk->dst);
@@ -1174,6 +1191,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;