[libvirt] [PATCH] qemu: Mark domains as having managed state image only on managed save

QEmu domains were marked as having managed save image even if they were saved using the regular save. With this patch, domains are marked so only when using managed save API. --- src/qemu/qemu_driver.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2f93404..3410535 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2739,7 +2739,6 @@ qemuDomainSaveInternal(struct qemud_driver *driver, virDomainPtr dom, } ret = 0; - vm->hasManagedSave = true; /* Shut it down */ qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_SAVED, 0); @@ -2916,8 +2915,10 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int flags) VIR_INFO("Saving state to %s", name); compressed = QEMUD_SAVE_FORMAT_RAW; - ret = qemuDomainSaveInternal(driver, dom, vm, name, compressed, - NULL, flags); + if ((ret = qemuDomainSaveInternal(driver, dom, vm, name, compressed, + NULL, flags)) == 0) + vm->hasManagedSave = true; + vm = NULL; cleanup: -- 1.7.8.6

On 04.07.2012 10:26, Peter Krempa wrote:
QEmu domains were marked as having managed save image even if they were
It's QEMU, Qemu, or qemu actually.
saved using the regular save. With this patch, domains are marked so only when using managed save API. --- src/qemu/qemu_driver.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2f93404..3410535 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2739,7 +2739,6 @@ qemuDomainSaveInternal(struct qemud_driver *driver, virDomainPtr dom, }
ret = 0; - vm->hasManagedSave = true;
/* Shut it down */ qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_SAVED, 0); @@ -2916,8 +2915,10 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int flags) VIR_INFO("Saving state to %s", name);
compressed = QEMUD_SAVE_FORMAT_RAW; - ret = qemuDomainSaveInternal(driver, dom, vm, name, compressed, - NULL, flags); + if ((ret = qemuDomainSaveInternal(driver, dom, vm, name, compressed, + NULL, flags)) == 0) + vm->hasManagedSave = true; + vm = NULL;
cleanup:
ACK with capitalization fixed. Michal

On 07/04/12 11:01, Michal Privoznik wrote:
On 04.07.2012 10:26, Peter Krempa wrote:
QEmu domains were marked as having managed save image even if they were
It's QEMU, Qemu, or qemu actually.
Indeed! I remembered it wrong for some reason :(
saved using the regular save. With this patch, domains are marked so only when using managed save API. --- src/qemu/qemu_driver.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
ACK with capitalization fixed.
Fixed && pushed. Thanks! Peter

On 07/04/2012 03:01 AM, Michal Privoznik wrote:
On 04.07.2012 10:26, Peter Krempa wrote:
QEmu domains were marked as having managed save image even if they were
It's QEMU, Qemu, or qemu actually.
Actually, upstream qemu has been insistent on getting rid of 'Qemu' (except maybe at the start of an English sentence), favoring 'QEMU' for the package name, and 'qemu' for the executable name. -- Eric Blake eblake@redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
participants (3)
-
Eric Blake
-
Michal Privoznik
-
Peter Krempa