rpm/libvirt
SHA256
1
0
Fork 0
forked from pool/libvirt
Code Pull Requests Activity

- Replace libxl-default-pcistub-name.patch with upstream variant

Browse Source 
ee3dc2c2-libxl-default-pcistub-name.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=882
This commit is contained in:
James Fehlig 2021-03-10 18:42:14 +00:00 committed by Git OBS Bridge
parent 53398caf68
commit a6b7b199b5
6 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0001-libxl-add-support-for-BlockResize-API.patch
View File

@ -120,7 +120,7 @@ Index: libvirt-7.1.0/src/libxl/libxl_driver.c
static int
libxlDomainGetJobInfo(virDomainPtr dom,
virDomainJobInfoPtr info)
@@ -6607,6 +6697,7 @@ static virHypervisorDriver libxlHypervis
@@ -6610,6 +6700,7 @@ static virHypervisorDriver libxlHypervis
#endif
.nodeGetFreeMemory = libxlNodeGetFreeMemory, /* 0.9.0 */
.nodeGetCellsFreeMemory = libxlNodeGetCellsFreeMemory, /* 1.1.1 */

18
libxl-default-pcistub-name.patch → ee3dc2c2-libxl-default-pcistub-name.patch
View File

@ -1,4 +1,4 @@
commit 844c278ad2a957592ba9fbf93c6aa076a2b3d216
commit ee3dc2c2c8e5b2d3976e43dde95bc0aeeafbef4f
Author: Jim Fehlig <jfehlig@suse.com>
Date: Mon Mar 1 15:41:44 2021 -0700
@ -7,6 +7,7 @@ Date: Mon Mar 1 15:41:44 2021 -0700
Commit 887dd0d331 caused a small regression in NodeDeviceDetach in the libxl
driver when the 'driver' parameter is not specified. E.g.
# virsh nodedev-detach pci_0000_0a_10_0
error: Failed to detach device pci_0000_0a_10_0
error: An error occurred, but the cause is unknown
@ -16,18 +17,21 @@ Date: Mon Mar 1 15:41:44 2021 -0700
"xen" if it is not specified when invoking NodeDeviceDetach.
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 75a8d46af0..348434ca72 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -5777,6 +5777,9 @@ libxlNodeDeviceDetachFlags(virNodeDevicePtr dev,
Index: libvirt-7.1.0/src/libxl/libxl_driver.c
===================================================================
--- libvirt-7.1.0.orig/src/libxl/libxl_driver.c
+++ libvirt-7.1.0/src/libxl/libxl_driver.c
@@ -5777,7 +5777,10 @@ libxlNodeDeviceDetachFlags(virNodeDevice
virCheckFlags(0, -1);
- if (driverName && STRNEQ(driverName, "xen")) {
+ if (!driverName)
+ driverName = "xen";
+
if (driverName && STRNEQ(driverName, "xen")) {
+ if (STRNEQ(driverName, "xen")) {
virReportError(VIR_ERR_INVALID_ARG,
_("unsupported driver name '%s'"), driverName);
return -1;

6
libvirt.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Mar 10 18:37:38 UTC 2021 - James Fehlig <jfehlig@suse.com>
- Replace libxl-default-pcistub-name.patch with upstream variant
ee3dc2c2-libxl-default-pcistub-name.patch
-------------------------------------------------------------------
Mon Mar 1 23:06:57 UTC 2021 - James Fehlig <jfehlig@suse.com>

2
libvirt.spec
View File

@ -291,10 +291,10 @@ Source6: libvirtd-relocation-server.xml
Source99: baselibs.conf
Source100: %{name}-rpmlintrc
# Upstream patches
Patch0: ee3dc2c2-libxl-default-pcistub-name.patch
# Patches pending upstream review
Patch100: libxl-dom-reset.patch
Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch
Patch102: libxl-default-pcistub-name.patch
# Need to go upstream
Patch150: libvirt-power8-models.patch
Patch151: ppc64le-canonical-name.patch

2
libxl-dom-reset.patch
View File

@ -74,7 +74,7 @@ Index: libvirt-7.1.0/src/libxl/libxl_driver.c
libxlDomainDestroyFlags(virDomainPtr dom,
unsigned int flags)
{
@@ -6485,6 +6540,7 @@ static virHypervisorDriver libxlHypervis
@@ -6488,6 +6543,7 @@ static virHypervisorDriver libxlHypervis
.domainShutdown = libxlDomainShutdown, /* 0.9.0 */
.domainShutdownFlags = libxlDomainShutdownFlags, /* 0.9.10 */
.domainReboot = libxlDomainReboot, /* 0.9.0 */

6
libxl-set-migration-constraints.patch
View File

@ -77,7 +77,7 @@ Index: libvirt-7.1.0/src/libxl/libxl_driver.c
===================================================================
--- libvirt-7.1.0.orig/src/libxl/libxl_driver.c
+++ libvirt-7.1.0/src/libxl/libxl_driver.c
@@ -6047,6 +6047,9 @@ libxlDomainMigratePerform3Params(virDoma
@@ -6050,6 +6050,9 @@ libxlDomainMigratePerform3Params(virDoma
const char *dname = NULL;
const char *uri = NULL;
int ret = -1;
@ -87,7 +87,7 @@ Index: libvirt-7.1.0/src/libxl/libxl_driver.c
#ifdef LIBXL_HAVE_NO_SUSPEND_RESUME
virReportUnsupportedError();
@@ -6063,6 +6066,15 @@ libxlDomainMigratePerform3Params(virDoma
@@ -6066,6 +6069,15 @@ libxlDomainMigratePerform3Params(virDoma
virTypedParamsGetString(params, nparams,
VIR_MIGRATE_PARAM_DEST_NAME,
&dname) < 0 ||
@ -103,7 +103,7 @@ Index: libvirt-7.1.0/src/libxl/libxl_driver.c
virTypedParamsGetString(params, nparams,
VIR_MIGRATE_PARAM_URI,
&uri) < 0)
@@ -6077,11 +6089,11 @@ libxlDomainMigratePerform3Params(virDoma
@@ -6080,11 +6092,11 @@ libxlDomainMigratePerform3Params(virDoma
if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) {
if (libxlDomainMigrationSrcPerformP2P(driver, vm, dom->conn, dom_xml,