From: Cole Robinson <crobinso@redhat.com>
Date: Sat, 9 Jan 2010 02:07:37 +0000 (-0500)
Subject: qemu: Disable errors in qemudShutdownVMDaemon
X-Git-Tag: v0.7.6~200
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=978dd6d48bbe648fac1d05e110e35f2038b1c5a9;p=thirdparty%2Flibvirt.git

qemu: Disable errors in qemudShutdownVMDaemon
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 02f612fffa..deb8adc2ca 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -2622,12 +2622,17 @@ static void qemudShutdownVMDaemon(virConnectPtr conn,
     int ret;
     int retries = 0;
     qemuDomainObjPrivatePtr priv = vm->privateData;
+    virErrorPtr orig_err;
 
     if (!virDomainObjIsActive(vm))
         return;
 
     VIR_DEBUG("Shutting down VM '%s'", vm->def->name);
 
+    /* This method is routinely used in clean up paths. Disable error
+     * reporting so we don't squash a legit error. */
+    orig_err = virSaveLastError();
+
     if (driver->macFilter) {
         int i;
         virDomainDefPtr def = vm->def;
@@ -2707,6 +2712,11 @@ retry:
         vm->def->id = -1;
         vm->newDef = NULL;
     }
+
+    if (orig_err) {
+        virSetError(orig_err);
+        virFreeError(orig_err);
+    }
 }