From: Daniel P. Berrange <berrange@redhat.com>
Date: Fri, 25 Jun 2010 13:04:57 +0000 (-0400)
Subject: Don't squash file permissions when migration fails
X-Git-Tag: v0.8.2~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d9743158c6c0dece1bbef2b58924b25fd3bd5dc;p=thirdparty%2Flibvirt.git

Don't squash file permissions when migration fails

If an active migration operation fails, or is cancelled by the
admin, the QEMU on the destination is shutdown and the one on
the source continues running. It is important in shutting down
the QEMU on the destination, the security drivers don't reset
the file labelling/permissions.

* src/qemu/qemu_driver.c: Don't reset labelling/permissions
  on migration abort
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 1257c70511..6ae4e8c688 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -11230,7 +11230,7 @@ qemudDomainMigrateFinish2 (virConnectPtr dconn,
             goto endjob;
         }
     } else {
-        qemudShutdownVMDaemon(driver, vm, 0);
+        qemudShutdownVMDaemon(driver, vm, 1);
         event = virDomainEventNewFromObj(vm,
                                          VIR_DOMAIN_EVENT_STOPPED,
                                          VIR_DOMAIN_EVENT_STOPPED_FAILED);