From f2d7cb1fcefcb84707e5efe45a7c060b6c920f62 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Thu, 8 Sep 2016 19:57:49 +0000 Subject: [PATCH] - bsc#996020 - L3: Unable to migrate VMs between SLES12 SP1 XEN Hosts with virt-manager 0425975f-use-virDomainMigrate3-API.patch 561f5cd3-drop-xenmigr-scheme-from-Xen-migration-URI.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=330 --- 0425975f-use-virDomainMigrate3-API.patch | 36 +++++++++++++++++++ ...enmigr-scheme-from-Xen-migration-URI.patch | 35 ++++++++++++++++++ virt-manager.changes | 8 +++++ virt-manager.spec | 4 +++ 4 files changed, 83 insertions(+) create mode 100644 0425975f-use-virDomainMigrate3-API.patch create mode 100644 561f5cd3-drop-xenmigr-scheme-from-Xen-migration-URI.patch diff --git a/0425975f-use-virDomainMigrate3-API.patch b/0425975f-use-virDomainMigrate3-API.patch new file mode 100644 index 00000000..a8f9d2c2 --- /dev/null +++ b/0425975f-use-virDomainMigrate3-API.patch @@ -0,0 +1,36 @@ +References: bsc#996020 + +Subject: virt-manager: use virDomainMigrate3 API +From: Jim Fehlig jfehlig@suse.com Wed Aug 31 11:26:24 2016 -0600 +Date: Thu Sep 8 11:47:45 2016 -0400: +Git: 0425975f38cec8fca6fd6ad600985403b9d24adb + +libvirt has supported the migration V3 protocol for many years now. +A nice feature of the virDomainMigrate3 API is that it will detect +the protocol version supported by the underlying hypervisor, +including whether it supports the extensible parameters variant, +and call the hypervisor API with parameters fixed up as needed. + +Change virt-manager to use the virDomainMigrate3 API, allowing +migration to work with hypervisors that only support the extensible +parameters variant of the migration V3 API. + +Signed-off-by: Jim Fehlig + +Index: virt-manager-1.4.0/virtManager/domain.py +=================================================================== +--- virt-manager-1.4.0.orig/virtManager/domain.py ++++ virt-manager-1.4.0/virtManager/domain.py +@@ -1487,7 +1487,11 @@ class vmmDomain(vmmLibvirtObject): + if meter: + start_job_progress_thread(self, meter, _("Migrating domain")) + +- self._backend.migrate(libvirt_destconn, flags, None, interface, 0) ++ params = {} ++ if interface: ++ params[libvirt.VIR_MIGRATE_PARAM_URI] = interface ++ ++ self._backend.migrate3(libvirt_destconn, params, flags) + + # Don't schedule any conn update, migrate dialog handles it for us + diff --git a/561f5cd3-drop-xenmigr-scheme-from-Xen-migration-URI.patch b/561f5cd3-drop-xenmigr-scheme-from-Xen-migration-URI.patch new file mode 100644 index 00000000..5a68eaa3 --- /dev/null +++ b/561f5cd3-drop-xenmigr-scheme-from-Xen-migration-URI.patch @@ -0,0 +1,35 @@ +References: bsc#996020 + +Subject: virt-manager: drop 'xenmigr' scheme from Xen migration URI +From: Jim Fehlig jfehlig@suse.com Tue Sep 6 22:55:42 2016 -0600 +Date: Thu Sep 8 11:47:52 2016 -0400: +Git: 561f5cd3e68fa3f1fb6745463a5c1a486171d8c9 + +For Xen, virt-manager uses a 'xenmigr' URI scheme, which is not +supported by the libvirt libxl driver. Attempting migration +fails with + +libvirtError: invalid argument: unable to parse URI: xenmigr://myhost + +The old xend-based libvirt driver supports this scheme, but also +supports an empty scheme. It's not clear what the 'xenmigr' scheme +is used for. 'xenmigr' is not referenced by any files in the Xen +code-base, including old branches with xend. + +Drop setting scheme to 'xenmigr' when creating the Xen migration URI. + +Signed-off-by: Jim Fehlig + +Index: virt-manager-1.4.0/virtManager/migrate.py +=================================================================== +--- virt-manager-1.4.0.orig/virtManager/migrate.py ++++ virt-manager-1.4.0/virtManager/migrate.py +@@ -344,7 +344,7 @@ class vmmMigrateDialog(vmmGObjectUI): + return + + if self.conn.is_xen(): +- uri = "xenmigr://%s" % address ++ uri = "%s" % address + else: + uri = "tcp:%s" % address + if port: diff --git a/virt-manager.changes b/virt-manager.changes index f464c165..70dc5134 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Sep 8 13:50:49 MDT 2016 - carnold@suse.com + +- bsc#996020 - L3: Unable to migrate VMs between SLES12 SP1 XEN + Hosts with virt-manager + 0425975f-use-virDomainMigrate3-API.patch + 561f5cd3-drop-xenmigr-scheme-from-Xen-migration-URI.patch + ------------------------------------------------------------------- Thu Sep 8 10:03:24 MDT 2016 - carnold@suse.com diff --git a/virt-manager.spec b/virt-manager.spec index 833b7ff2..1555914a 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -47,6 +47,8 @@ Patch7: 835ddc5f-xmlbuilder-04.patch Patch8: b08647c2-xmlbuilder-05.patch Patch9: b31c0b44-Add-classes-for-defining-SMBios-information.patch Patch10: a3206f89-Add-the-sysinfo-option.patch +Patch11: 0425975f-use-virDomainMigrate3-API.patch +Patch12: 561f5cd3-drop-xenmigr-scheme-from-Xen-migration-URI.patch # SUSE Only Patch70: virtman-desktop.patch Patch71: virtman-kvm.patch @@ -174,6 +176,8 @@ machine). %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 +%patch12 -p1 # SUSE Only %patch70 -p1 %patch71 -p1