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

Accepting request 769785 from home:jfehlig:branches:Virtualization

Browse Source 
Another libvirt update for Factory.

- lib: Prohibit parallel connections with tunneled migration
  e092daac-prohib-parallel-tunneled-mig.patch
  jsc#SLE-6998

- BuildRequire pkgconfig((lib)?udev) instead of (lib)?udev: allow
  OBS to shortcut through -mini flavors.

OBS-URL: https://build.opensuse.org/request/show/769785
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=804
This commit is contained in:
James Fehlig 2020-02-03 19:55:06 +00:00 committed by Git OBS Bridge
parent f02ed55bb3
commit 2e80a01b56
3 changed files with 90 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
e092daac-prohib-parallel-tunneled-mig.patch Normal file
View File

@ -0,0 +1,75 @@
commit e092daacee330b8f758bceaf1e9a0ccfec2e00c8
Author: Jim Fehlig <jfehlig@suse.com>
Date: Fri Jan 17 10:36:32 2020 -0700
lib: Prohibit parallel connections with tunneled migration
As discussed on the developer list, parallel migration connections
are not compatible with tunneled migration
https://www.redhat.com/archives/libvir-list/2020-January/msg00463.html
Prohibit the concurrent use of parallel and tunneled migration options.
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Index: libvirt-6.0.0/src/libvirt-domain.c
===================================================================
--- libvirt-6.0.0.orig/src/libvirt-domain.c
+++ libvirt-6.0.0/src/libvirt-domain.c
@@ -3548,6 +3548,10 @@ virDomainMigrate(virDomainPtr domain,
VIR_MIGRATE_NON_SHARED_INC,
error);
+ VIR_EXCLUSIVE_FLAGS_GOTO(VIR_MIGRATE_TUNNELLED,
+ VIR_MIGRATE_PARALLEL,
+ error);
+
if (flags & VIR_MIGRATE_OFFLINE) {
if (!VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn,
VIR_DRV_FEATURE_MIGRATION_OFFLINE)) {
@@ -3703,6 +3707,10 @@ virDomainMigrate2(virDomainPtr domain,
VIR_MIGRATE_NON_SHARED_INC,
error);
+ VIR_EXCLUSIVE_FLAGS_GOTO(VIR_MIGRATE_TUNNELLED,
+ VIR_MIGRATE_PARALLEL,
+ error);
+
if (flags & VIR_MIGRATE_OFFLINE) {
if (!VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn,
VIR_DRV_FEATURE_MIGRATION_OFFLINE)) {
@@ -4089,6 +4097,10 @@ virDomainMigrateToURI(virDomainPtr domai
virCheckReadOnlyGoto(domain->conn->flags, error);
virCheckNonNullArgGoto(duri, error);
+ VIR_EXCLUSIVE_FLAGS_GOTO(VIR_MIGRATE_TUNNELLED,
+ VIR_MIGRATE_PARALLEL,
+ error);
+
if (virDomainMigrateUnmanagedCheckCompat(domain, flags) < 0)
goto error;
@@ -4161,6 +4173,10 @@ virDomainMigrateToURI2(virDomainPtr doma
virCheckDomainReturn(domain, -1);
virCheckReadOnlyGoto(domain->conn->flags, error);
+ VIR_EXCLUSIVE_FLAGS_GOTO(VIR_MIGRATE_TUNNELLED,
+ VIR_MIGRATE_PARALLEL,
+ error);
+
if (virDomainMigrateUnmanagedCheckCompat(domain, flags) < 0)
goto error;
@@ -4234,6 +4250,10 @@ virDomainMigrateToURI3(virDomainPtr doma
virCheckDomainReturn(domain, -1);
virCheckReadOnlyGoto(domain->conn->flags, error);
+ VIR_EXCLUSIVE_FLAGS_GOTO(VIR_MIGRATE_TUNNELLED,
+ VIR_MIGRATE_PARALLEL,
+ error);
+
if (virDomainMigrateUnmanagedCheckCompat(domain, flags) < 0)
goto error;

19
libvirt.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Mon Feb 3 18:32:49 UTC 2020 - James Fehlig <jfehlig@suse.com>
- lib: Prohibit parallel connections with tunneled migration
e092daac-prohib-parallel-tunneled-mig.patch
jsc#SLE-6998
-------------------------------------------------------------------
Mon Feb 3 15:27:17 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- BuildRequire pkgconfig((lib)?udev) instead of (lib)?udev: allow
OBS to shortcut through -mini flavors.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 30 22:05:24 UTC 2020 - James Fehlig <jfehlig@suse.com> Thu Jan 30 22:05:24 UTC 2020 - James Fehlig <jfehlig@suse.com>
@ -18,12 +31,6 @@ Wed Jan 29 20:56:13 UTC 2020 - James Fehlig <jfehlig@suse.com>
6c1dddaf-libxl-shutdown-inhibit.patch 6c1dddaf-libxl-shutdown-inhibit.patch
bsc#1157100 bsc#1157100
-------------------------------------------------------------------
Fri Jan 24 14:03:15 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- BuildRequire pkgconfig((lib)?udev) instead of (lib)?udev: allow
OBS to shortcut through -mini flavors.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 15 19:27:10 UTC 2020 - James Fehlig <jfehlig@suse.com> Wed Jan 15 19:27:10 UTC 2020 - James Fehlig <jfehlig@suse.com>

2
libvirt.spec
View File

@ -341,6 +341,7 @@ Source100: %{name}-rpmlintrc
Patch0: 6c1dddaf-libxl-shutdown-inhibit.patch Patch0: 6c1dddaf-libxl-shutdown-inhibit.patch
Patch1: 849052ec-libxl-support-credit2.patch Patch1: 849052ec-libxl-support-credit2.patch
Patch2: 72ed254b-drop-exec-perms-bashcompletion.patch Patch2: 72ed254b-drop-exec-perms-bashcompletion.patch
Patch3: e092daac-prohib-parallel-tunneled-mig.patch
# Patches pending upstream review # Patches pending upstream review
Patch100: libxl-dom-reset.patch Patch100: libxl-dom-reset.patch
Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch
@ -876,6 +877,7 @@ libvirt plugin for NSS for translating domain names into IP addresses.
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
%patch100 -p1 %patch100 -p1
%patch101 -p1 %patch101 -p1
%patch150 -p1 %patch150 -p1