]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: don't restore state label twice
authorEric Blake <eblake@redhat.com>
Fri, 25 Mar 2011 16:06:41 +0000 (10:06 -0600)
committerEric Blake <eblake@redhat.com>
Mon, 28 Mar 2011 15:10:09 +0000 (09:10 -0600)
Otherwise, if something like doStopVcpus fails after the first
restore, a second restore is attempted and throws a useless
warning.

* src/qemu/qemu_driver.c (qemudDomainSaveFlag): Avoid second
restore of state label.

src/qemu/qemu_driver.c

index 016ad1d430458ba8f2cab6d0ed2e5e6ad4906c50..e0e86d331394b7b11765e15f4bac239548fe6bcf 100644 (file)
@@ -2044,6 +2044,7 @@ static int qemudDomainSaveFlag(struct qemud_driver *driver, virDomainPtr dom,
         virSecurityManagerRestoreSavedStateLabel(driver->securityManager,
                                                  vm, path) < 0)
         VIR_WARN("failed to restore save state label on %s", path);
+    bypassSecurityDriver = true;
 
     if (cgroup != NULL) {
         rc = virCgroupDenyDevicePath(cgroup, path,