From: Jiri Denemark <jdenemar@redhat.com>
Date: Mon, 5 Mar 2012 11:10:21 +0000 (+0100)
Subject: qemu: Shared or readonly disks are always safe wrt migration
X-Git-Tag: v0.9.11-rc1~159
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07dd6fb61077d0987e471549ffd9a418f7cfe78a;p=thirdparty%2Flibvirt.git

qemu: Shared or readonly disks are always safe wrt migration

No matter what cache mode is used, readonly disks are always safe wrt
migration. Shared disks are required to be readonly or to disable
host-side cache, which makes them safe as well.
---

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 84037e4eaf..5c4297c3b7 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -828,10 +828,12 @@ qemuMigrationIsSafe(virDomainDefPtr def)
     for (i = 0 ; i < def->ndisks ; i++) {
         virDomainDiskDefPtr disk = def->disks[i];
 
-        /* shared && !readonly implies cache=none */
+        /* Our code elsewhere guarantees shared disks are either readonly (in
+         * which case cache mode doesn't matter) or used with cache=none */
         if (disk->src &&
-            disk->cachemode != VIR_DOMAIN_DISK_CACHE_DISABLE &&
-            (disk->cachemode || !disk->shared || disk->readonly)) {
+            !disk->shared &&
+            !disk->readonly &&
+            disk->cachemode != VIR_DOMAIN_DISK_CACHE_DISABLE) {
             int cfs;
             if ((cfs = virStorageFileIsClusterFS(disk->src)) == 1)
                 continue;