From: Eric Blake <eblake@redhat.com>
Date: Fri, 25 Mar 2011 16:06:41 +0000 (-0600)
Subject: qemu: don't restore state label twice
X-Git-Tag: v0.9.0~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96d567862a079aca7edda88ad76f075b312c4862;p=thirdparty%2Flibvirt.git

qemu: don't restore state label twice

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.
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 016ad1d430..e0e86d3313 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -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,