update to qemu 2.2.0-rc2

[pve-qemu-kvm.git] / debian / patches / fix-qemu-img-snapshot-removal.patch

diff --git a/debian/patches/fix-qemu-img-snapshot-removal.patch b/debian/patches/fix-qemu-img-snapshot-removal.patch
index 7a6ad3bdfcbbb05d62172fa70c5df1520331a7ac..58d9ecc857cef50a16340563f696409626c223fb 100644 (file)
--- a/debian/patches/fix-qemu-img-snapshot-removal.patch
+++ b/debian/patches/fix-qemu-img-snapshot-removal.patch
@@ -1,15 +1,14 @@
 Index: new/qemu-img.c
 ===================================================================
---- new.orig/qemu-img.c        2012-11-21 11:11:22.000000000 +0100
-+++ new/qemu-img.c     2012-11-21 11:51:19.000000000 +0100
-@@ -1580,7 +1580,9 @@
-             error_report("Could not delete snapshot '%s': %d (%s)",
-                 snapshot_name, ret, strerror(-ret));
-         }
--        break;
+--- new.orig/qemu-img.c        2014-11-20 06:45:06.000000000 +0100
++++ new/qemu-img.c     2014-11-20 06:51:05.000000000 +0100
+@@ -2080,7 +2080,8 @@
+ 
+     list = collect_image_info_list(filename, fmt, chain);
+     if (!list) {
+-        return 1;
 +      // return success if snapshot does not exists
-+      if (ret == -ENOENT) ret = 0;
-+       break;
++        return 0;
      }
  
-     /* Cleanup */
+     switch (output_format) {