remove qemu-img-convert-skipcreate-option.patch

diff --git a/debian/changelog b/debian/changelog
index 7423e16a5c536df9210116dc834fd32383865188..d77af3b4a1cbc6953e7ce531319e2bcf94c1400e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pve-qemu-kvm (1.7-1) unstable; urgency=low
+
+  * remove qemu-img-convert-skipcreate-option.patch (now upstream)
+  
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 27 Nov 2013 10:55:35 +0100
+
 pve-qemu-kvm (1.4-17) unstable; urgency=low
 
   * enable glusterfs backend

diff --git a/debian/patches/qemu-img-convert-skipcreate-option.patch b/debian/patches/qemu-img-convert-skipcreate-option.patch
deleted file mode 100644 (file)
index cae8a26..0000000
--- a/debian/patches/qemu-img-convert-skipcreate-option.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 6b8ac153620bbc1a39e9ee6eef0392219886ebb3 Mon Sep 17 00:00:00 2001
-From: Alexandre Derumier <aderumier@odiso.com>
-Date: Mon, 29 Oct 2012 10:02:33 +0100
-Subject: [PATCH] skipcreate
-
-
-Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
----
- qemu-img.c |   36 +++++++++++++++++++++---------------
- 1 file changed, 21 insertions(+), 15 deletions(-)
-
-Index: new/qemu-img.c
-===================================================================
---- new.orig/qemu-img.c        2013-02-11 12:01:06.000000000 +0100
-+++ new/qemu-img.c     2013-02-11 12:12:34.000000000 +0100
-@@ -665,7 +665,7 @@
- 
- static int img_convert(int argc, char **argv)
- {
--    int c, ret = 0, n, n1, bs_n, bs_i, compress, cluster_size, cluster_sectors;
-+    int c, ret = 0, n, n1, bs_n, bs_i, compress, cluster_size, cluster_sectors, skipcreate;
-     int progress = 0, flags;
-     const char *fmt, *out_fmt, *cache, *out_baseimg, *out_filename;
-     BlockDriver *drv, *proto_drv;
-@@ -687,8 +687,9 @@
-     cache = "unsafe";
-     out_baseimg = NULL;
-     compress = 0;
-+    skipcreate = 0;
-     for(;;) {
--        c = getopt(argc, argv, "f:O:B:s:hce6o:pS:t:");
-+        c = getopt(argc, argv, "f:O:B:s:hcCe6o:pS:t:");
-         if (c == -1) {
-             break;
-         }
-@@ -709,6 +710,9 @@
-         case 'c':
-             compress = 1;
-             break;
-+        case 'C':
-+            skipcreate = 1;
-+            break;
-         case 'e':
-             error_report("option -e is deprecated, please use \'-o "
-                   "encryption\' instead!");
-@@ -869,20 +873,22 @@
-         }
-     }
- 
--    /* Create the new image */
--    ret = bdrv_create(drv, out_filename, param);
--    if (ret < 0) {
--        if (ret == -ENOTSUP) {
--            error_report("Formatting not supported for file format '%s'",
--                         out_fmt);
--        } else if (ret == -EFBIG) {
--            error_report("The image size is too large for file format '%s'",
--                         out_fmt);
--        } else {
--            error_report("%s: error while converting %s: %s",
--                         out_filename, out_fmt, strerror(-ret));
-+    if (!skipcreate) {
-+        /* Create the new image */
-+        ret = bdrv_create(drv, out_filename, param);
-+        if (ret < 0) {
-+            if (ret == -ENOTSUP) {
-+                 error_report("Formatting not supported for file format '%s'",
-+                              out_fmt);
-+            } else if (ret == -EFBIG) {
-+                 error_report("The image size is too large for file format '%s'",
-+                              out_fmt);
-+            } else {
-+                error_report("%s: error while converting %s: %s",
-+                             out_filename, out_fmt, strerror(-ret));
-+            }
-+            goto out;
-         }
--        goto out;
-     }
- 
-     flags = BDRV_O_RDWR;

diff --git a/debian/patches/series b/debian/patches/series
index 2abf1a929f58c3f4e9da50a44105c09f90d10b94..d7a64e68257a3328a47715bd1dbe28716d36b1b1 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,7 +7,6 @@ vencrypt-auth-plain.patch
 fix-qemu-img-snapshot-removal.patch
 move-bdrv-snapshot-find.patch
 internal-snapshot-async.patch
-qemu-img-convert-skipcreate-option.patch
 enable-kvm-by-default.patch
 # include qemu backup series
 0001-add-documenation-for-new-backup-framework.patch