diff --git a/e092daac-prohib-parallel-tunneled-mig.patch b/e092daac-prohib-parallel-tunneled-mig.patch new file mode 100644 index 0000000..163025e --- /dev/null +++ b/e092daac-prohib-parallel-tunneled-mig.patch @@ -0,0 +1,75 @@ +commit e092daacee330b8f758bceaf1e9a0ccfec2e00c8 +Author: Jim Fehlig +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 + Reviewed-by: Ján Tomko + +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; + diff --git a/libvirt.changes b/libvirt.changes index 941f8e2..b43c40f 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Feb 3 18:32:49 UTC 2020 - James Fehlig + +- 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 + +- 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 @@ -18,12 +31,6 @@ Wed Jan 29 20:56:13 UTC 2020 - James Fehlig 6c1dddaf-libxl-shutdown-inhibit.patch bsc#1157100 -------------------------------------------------------------------- -Fri Jan 24 14:03:15 UTC 2020 - Dominique Leuenberger - -- 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 diff --git a/libvirt.spec b/libvirt.spec index 4e5d469..dcdcfd9 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -341,6 +341,7 @@ Source100: %{name}-rpmlintrc Patch0: 6c1dddaf-libxl-shutdown-inhibit.patch Patch1: 849052ec-libxl-support-credit2.patch Patch2: 72ed254b-drop-exec-perms-bashcompletion.patch +Patch3: e092daac-prohib-parallel-tunneled-mig.patch # Patches pending upstream review Patch100: libxl-dom-reset.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 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %patch100 -p1 %patch101 -p1 %patch150 -p1