[libvirt] [PATCH 5/6] qemu: Disable errors in qemudShutdownVMDaemon

Cole Robinson crobinso at redhat.com
Thu Nov 5 18:17:46 UTC 2009


ShutdownVMDaemon is regularly used in cleanup paths, so let's make sure
it doesn't squash any original errors.

Signed-off-by: Cole Robinson <crobinso at redhat.com>
---
 src/qemu/qemu_driver.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 91fdd3b..281c02d 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -2174,6 +2174,10 @@ static void qemudShutdownVMDaemon(virConnectPtr conn,
 
     VIR_DEBUG(_("Shutting down VM '%s'\n"), vm->def->name);
 
+    /* This method is routinely used in clean up paths. Disable error
+     * reporting so we don't squash a legit error. */
+    virDisableErrors();
+
     if (driver->macFilter) {
         int i;
         virDomainDefPtr def = vm->def;
@@ -2256,6 +2260,8 @@ retry:
         vm->def->id = -1;
         vm->newDef = NULL;
     }
+
+    virEnableErrors();
 }
 
 
-- 
1.6.5.1




More information about the libvir-list mailing list