From aa037364ed252db74ff4f41610f238b880602c35 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Aug 19 2009 17:13:01 +0000 Subject: * Wed Aug 19 2009 Mark McLoughlin - 0.7.0-6 - Fix migration completion with newer versions of qemu (#516187) --- diff --git a/libvirt-0.6.4-svirt-sound.patch b/libvirt-0.6.4-svirt-sound.patch index 5c209b4..a011299 100644 --- a/libvirt-0.6.4-svirt-sound.patch +++ b/libvirt-0.6.4-svirt-sound.patch @@ -1,4 +1,4 @@ -From 1e99b2edee0eb3ca1c600e5bd5c55741cb95a29a Mon Sep 17 00:00:00 2001 +From 5f8d720b5f1393ee333a5fa8375ffe9ac954d48b Mon Sep 17 00:00:00 2001 From: Daniel P. Berrange Date: Mon, 17 Aug 2009 08:32:08 +0100 Subject: [PATCH] Disable sound cards when running sVirt diff --git a/libvirt-fix-migration-completion-with-newer-qemu.patch b/libvirt-fix-migration-completion-with-newer-qemu.patch new file mode 100644 index 0000000..0cfccc2 --- /dev/null +++ b/libvirt-fix-migration-completion-with-newer-qemu.patch @@ -0,0 +1,45 @@ +From f2eb2ad5163d5bae2392a8bfc6040c45426c9f5f Mon Sep 17 00:00:00 2001 +From: Chris Lalancette +Date: Wed, 5 Aug 2009 13:42:07 +0200 +Subject: [PATCH] Run 'cont' on successful migration finish. + +https://bugzilla.redhat.com/516187 + +As of qemu 0.10.6, qemu now honors the -S flag on incoming migration. +That means that when the migration completes, we have to issue a +'cont' command to get the VM running again. We do it unconditionally +since it won't hurt on older qemu. + +(cherry picked from commit d1ec4d7a5a4f50c9492137eaab4f021caa075f95) + +Fedora-patch: libvirt-fix-migration-completion-with-newer-qemu.patch +--- + src/qemu_driver.c | 11 +++++++++++ + 1 files changed, 11 insertions(+), 0 deletions(-) + +diff --git a/src/qemu_driver.c b/src/qemu_driver.c +index 99dac52..bf9a0b2 100644 +--- a/src/qemu_driver.c ++++ b/src/qemu_driver.c +@@ -6951,7 +6951,18 @@ qemudDomainMigrateFinish2 (virConnectPtr dconn, + */ + if (retcode == 0) { + dom = virGetDomain (dconn, vm->def->name, vm->def->uuid); ++ ++ /* run 'cont' on the destination, which allows migration on qemu ++ * >= 0.10.6 to work properly. This isn't strictly necessary on ++ * older qemu's, but it also doesn't hurt anything there ++ */ ++ if (qemudMonitorCommand(vm, "cont", &info) < 0) { ++ qemudReportError(dconn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, ++ "%s", _("resume operation failed")); ++ goto cleanup; ++ } + VIR_FREE(info); ++ + vm->state = VIR_DOMAIN_RUNNING; + event = virDomainEventNewFromObj(vm, + VIR_DOMAIN_EVENT_RESUMED, +-- +1.6.2.5 + diff --git a/libvirt.spec b/libvirt.spec index 2df152d..8941fc9 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -78,7 +78,7 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.7.0 -Release: 5%{?dist}%{?extra_release} +Release: 6%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz @@ -117,6 +117,9 @@ Patch10: libvirt-allow-pci-hostdev-reset-to-reset-other-devices.patch # Add PCI host device hotplug support Patch11: libvirt-add-pci-hostdev-hotplug-support.patch +# Fix migration completion with newer versions of qemu (#516187) +Patch12: libvirt-fix-migration-completion-with-newer-qemu.patch + # Temporary hack till PulseAudio autostart problems are sorted # out when SELinux enforcing (bz 486112) Patch200: libvirt-0.6.4-svirt-sound.patch @@ -309,6 +312,7 @@ of recent versions of Linux (and other OSes). %patch09 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 %patch200 -p1 @@ -677,6 +681,9 @@ fi %endif %changelog +* Wed Aug 19 2009 Mark McLoughlin - 0.7.0-6 +- Fix migration completion with newer versions of qemu (#516187) + * Wed Aug 19 2009 Mark McLoughlin - 0.7.0-5 - Add PCI host device hotplug support - Allow PCI bus reset to reset other devices (#499678)