From: Jiri Denemark <jdenemar@redhat.com>
Date: Thu, 11 Apr 2013 16:28:35 +0000 (+0200)
Subject: qemu: Do not report unsafe migration for local files
X-Git-Tag: v1.0.5-rc1~164
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88624b5d4c96e9423d34de53909e65b5fff0c549;p=thirdparty%2Flibvirt.git

qemu: Do not report unsafe migration for local files

When migrating a domain with disk images stored locally (and using
storage migration), we should not complain about unsafe migration no
matter what cache policy is used for that disk.
---

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index a263668a8d..a31bd022f0 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1477,13 +1477,17 @@ qemuMigrationIsSafe(virDomainDefPtr def)
             !disk->shared &&
             !disk->readonly &&
             disk->cachemode != VIR_DOMAIN_DISK_CACHE_DISABLE) {
-            int cfs;
+            int rc;
 
             if (disk->type == VIR_DOMAIN_DISK_TYPE_FILE) {
-                if ((cfs = virStorageFileIsClusterFS(disk->src)) == 1)
+                if ((rc = virStorageFileIsSharedFS(disk->src)) < 0)
+                    return false;
+                else if (rc == 0)
                     continue;
-                else if (cfs < 0)
+                if ((rc = virStorageFileIsClusterFS(disk->src)) < 0)
                     return false;
+                else if (rc == 1)
+                    continue;
             } else if (disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK &&
                        disk->protocol == VIR_DOMAIN_DISK_PROTOCOL_RBD) {
                 continue;