pool/libvirt
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- libxl: default to qemu driver for network disks

Browse Source 
a1c9a81a-libxl-rbd-fix.patch
  boo#981094

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=533
This commit is contained in:
James Fehlig 2016-05-25 14:57:57 +00:00 committed by Git OBS Bridge
parent 5714a82a32
commit 32ea3c1c57
4 changed files with 83 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
a1c9a81a-libxl-rbd-fix.patch Normal file
View File

@ -0,0 +1,70 @@
commit a1c9a81a318f3cd558faed7fc4c4933f95c07a07
Author: Jim Fehlig <jfehlig@suse.com>
Date: Mon May 23 15:56:01 2016 -0600
libxl: default to qemu driver for network disks
Xen only supports network-based disks with the qemu (aka qdisk) driver.
Set the driverName to 'qemu' in libxlDomainDeviceDefPostParse() if
not already set. When starting a domain with network-based disks,
ensure the driverName is 'qemu'.
Resolves: https://bugzilla.opensuse.org/show_bug.cgi?id=981094
Index: libvirt-1.3.4/src/libxl/libxl_conf.c
===================================================================
--- libvirt-1.3.4.orig/src/libxl/libxl_conf.c
+++ libvirt-1.3.4/src/libxl/libxl_conf.c
@@ -1055,13 +1055,18 @@ libxlMakeNetworkDiskSrc(virStorageSource
int
libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk)
{
- const char *driver;
- int format;
+ const char *driver = virDomainDiskGetDriver(l_disk);
+ int format = virDomainDiskGetFormat(l_disk);
int actual_type = virStorageSourceGetActualType(l_disk->src);
libxl_device_disk_init(x_disk);
if (actual_type == VIR_STORAGE_TYPE_NETWORK) {
+ if (STRNEQ_NULLABLE(driver, "qemu")) {
+ virReportError(VIR_ERR_OPERATION_INVALID, "%s",
+ _("only the 'qemu' driver can be used with network disks"));
+ return -1;
+ }
if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0)
return -1;
} else {
@@ -1072,8 +1077,6 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
if (VIR_STRDUP(x_disk->vdev, l_disk->dst) < 0)
return -1;
- driver = virDomainDiskGetDriver(l_disk);
- format = virDomainDiskGetFormat(l_disk);
if (driver) {
if (STREQ(driver, "tap") || STREQ(driver, "tap2")) {
switch (format) {
Index: libvirt-1.3.4/src/libxl/libxl_domain.c
===================================================================
--- libvirt-1.3.4.orig/src/libxl/libxl_domain.c
+++ libvirt-1.3.4/src/libxl/libxl_domain.c
@@ -364,6 +364,18 @@ libxlDomainDeviceDefPostParse(virDomainD
}
}
+ /* for network-based disks, set 'qemu' as the default driver */
+ if (dev->type == VIR_DOMAIN_DEVICE_DISK) {
+ virDomainDiskDefPtr disk = dev->data.disk;
+ int actual_type = virStorageSourceGetActualType(disk->src);
+
+ if (actual_type == VIR_STORAGE_TYPE_NETWORK) {
+ if (!virDomainDiskGetDriver(disk) &&
+ virDomainDiskSetDriver(disk, "qemu") < 0)
+ return -1;
+ }
+ }
+
return 0;
}

7
libvirt.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed May 25 14:55:16 UTC 2016 - jfehlig@suse.com
- libxl: default to qemu driver for network disks
a1c9a81a-libxl-rbd-fix.patch
boo#981094
-------------------------------------------------------------------
Wed May 18 04:55:22 UTC 2016 - jfehlig@suse.com

2
libvirt.spec
View File

@ -467,6 +467,7 @@ Patch5: b90c4b5f-tests-use-qemu-xen.patch
Patch6: fccf2725-libxl-API-4.4.patch
Patch7: 5325123d-libxl-migv2-save-restore.patch
Patch8: f9edcfa4-libxl-migv2-migration.patch
Patch9: a1c9a81a-libxl-rbd-fix.patch
# Patches pending upstream review
# Need to go upstream
Patch150: xen-pv-cdrom.patch
@ -999,6 +1000,7 @@ libvirt plugin for NSS for translating domain names into IP addresses.
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch150 -p1
%patch151 -p1
%patch152 -p1

8
libxl-support-block-script.patch
View File

@ -42,10 +42,10 @@ Index: libvirt-1.3.4/src/libxl/libxl_conf.c
libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk)
{
+ const char *src = virDomainDiskGetSource(l_disk);
const char *driver;
int format;
const char *driver = virDomainDiskGetDriver(l_disk);
int format = virDomainDiskGetFormat(l_disk);
int actual_type = virStorageSourceGetActualType(l_disk->src);
@@ -1065,7 +1085,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
@@ -1070,7 +1090,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0)
return -1;
} else {
@ -54,7 +54,7 @@ Index: libvirt-1.3.4/src/libxl/libxl_conf.c
return -1;
}
@@ -1174,6 +1194,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
@@ -1177,6 +1197,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;