]> xenbits.xensource.com Git - libvirt.git/commitdiff
Don't raise error message from cgroups if QEMU fails to start
authorDaniel P. Berrange <berrange@redhat.com>
Wed, 3 Mar 2010 15:48:22 +0000 (15:48 +0000)
committerDaniel P. Berrange <berrange@redhat.com>
Thu, 4 Mar 2010 11:56:21 +0000 (11:56 +0000)
The code to remove the cgroup after QEMU failed to startup could
be obscuring a real error from earlier on. It is not neccessary
to raise an error in this case, so tell cgroups to keep quiet

* src/qemu/qemu_driver.c: Don't raise cgroups error in QEMU start
  cleanup code.

src/qemu/qemu_driver.c

index b03ec2d00bfc2662f1bea74f19abf293d0a7d336..2c048395b2299468cc70e5c7fa7fdb5c0832c1bc 100644 (file)
@@ -2906,7 +2906,7 @@ cleanup:
     if (driver->securityDriver &&
         driver->securityDriver->domainReleaseSecurityLabel)
         driver->securityDriver->domainReleaseSecurityLabel(vm);
-    qemuRemoveCgroup(driver, vm, 0);
+    qemuRemoveCgroup(driver, vm, 1);
     if ((vm->def->ngraphics == 1) &&
         vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC &&
         vm->def->graphics[0]->data.vnc.autoport)