forked from pool/libvirt
62 lines
2.0 KiB
Diff
62 lines
2.0 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-1.3.1/src/libxl/libxl_conf.c
|
||
|
|
===================================================================
|
||
|
|
--- libvirt-1.3.1.orig/src/libxl/libxl_conf.c
|
||
|
|
+++ libvirt-1.3.1/src/libxl/libxl_conf.c
|
||
|
|
@@ -887,6 +887,22 @@ libxlDiskSetDiscard(libxl_device_disk *x
|
||
|
|
}
|
||
|
|
|
||
|
|
|
||
|
|
+static int
|
||
|
|
+libxlDiskSetScript(libxl_device_disk *x_disk, const char *disk_spec)
|
||
|
|
+{
|
||
|
|
+ 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;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
#define LIBXL_QEMU_DM_STR "Options specific to the Xen version:"
|
||
|
|
|
||
|
|
int
|
||
|
|
@@ -921,12 +937,13 @@ libxlDomainGetEmulatorType(const virDoma
|
||
|
|
int
|
||
|
|
libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk)
|
||
|
|
{
|
||
|
|
+ const char *src = virDomainDiskGetSource(l_disk);
|
||
|
|
const char *driver;
|
||
|
|
int format;
|
||
|
|
|
||
|
|
libxl_device_disk_init(x_disk);
|
||
|
|
|
||
|
|
- if (VIR_STRDUP(x_disk->pdev_path, virDomainDiskGetSource(l_disk)) < 0)
|
||
|
|
+ if (VIR_STRDUP(x_disk->pdev_path, src) < 0)
|
||
|
|
return -1;
|
||
|
|
|
||
|
|
if (VIR_STRDUP(x_disk->vdev, l_disk->dst) < 0)
|
||
|
|
@@ -1034,6 +1051,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
|
||
|
|
x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0;
|
||
|
|
if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0)
|
||
|
|
return -1;
|
||
|
|
+ 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;
|