[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/0.9.13_rc1-1

[Guido Günther]

The following commit has been merged in the experimental branch:
commit ab7be1093d1a85ad8020dec2dd98637909c7f8e7
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Jun 26 07:55:40 2012 +0200

    Drop Only-check-for-cluster-fs-if-we-re-using-a-filesyste.patch
    
    applied upstream

diff --git a/debian/patches/Only-check-for-cluster-fs-if-we-re-using-a-filesyste.patch b/debian/patches/Only-check-for-cluster-fs-if-we-re-using-a-filesyste.patch
deleted file mode 100644
index 525ae18..0000000
--- a/debian/patches/Only-check-for-cluster-fs-if-we-re-using-a-filesyste.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Wed, 6 Jun 2012 20:36:31 +0200
-Subject: Only check for cluster fs if we're using a filesystem
-
-otherwise migration fails for e.g. network filesystems like sheepdog
-with:
-
-   error: Invalid relative path 'virt-name': Invalid argument
-
-while we should fail with:
-
-    Migration may lead to data corruption if disks use cache != none
-
-References:
-
-    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676328
-    https://www.redhat.com/archives/libvirt-users/2012-May/msg00088.html
----
- src/qemu/qemu_migration.c |   11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
-index 6f42823..a20f05c 100644
---- a/src/qemu/qemu_migration.c
-+++ b/src/qemu/qemu_migration.c
-@@ -840,10 +840,13 @@ qemuMigrationIsSafe(virDomainDefPtr def)
-             !disk->readonly &&
-             disk->cachemode != VIR_DOMAIN_DISK_CACHE_DISABLE) {
-             int cfs;
--            if ((cfs = virStorageFileIsClusterFS(disk->src)) == 1)
--                continue;
--            else if (cfs < 0)
--                return false;
-+
-+            if (disk->type == VIR_DOMAIN_DISK_TYPE_FILE) {
-+                if ((cfs = virStorageFileIsClusterFS(disk->src)) == 1)
-+                    continue;
-+                else if (cfs < 0)
-+                    return false;
-+            }
- 
-             qemuReportError(VIR_ERR_MIGRATE_UNSAFE, "%s",
-                             _("Migration may lead to data corruption if disks"

-- 
Libvirt Debian packaging