rename previous patch (cleanup)

diff --git a/debian/patches/add_block_driver_type_to_extract b/debian/patches/add_block_driver_type_to_extract
deleted file mode 100644 (file)
index 98fd6f3..0000000
--- a/debian/patches/add_block_driver_type_to_extract
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: qemu-kvm-devel/vma.c
-===================================================================
---- qemu-kvm-devel.orig/vma.c
-+++ qemu-kvm-devel/vma.c
-@@ -299,7 +299,13 @@ static int extract_content(int argc, cha
-             }
- 
-             BlockDriverState *bs = bdrv_new();
--            if (errp || bdrv_open(&bs, devfn, NULL, NULL, flags, NULL, &errp)) {
-+
-+          char *tmp = g_strrstr(devfn, ".");
-+          char *format = (tmp == NULL) ? "raw" : ++tmp;
-+
-+          BlockDriver *drv = bdrv_find_format(format);
-+
-+          if (errp || bdrv_open(&bs, devfn, NULL, NULL, flags, drv, &errp)) {
-                 g_error("can't open file %s - %s", devfn,
-                         error_get_pretty(errp));
-             }

diff --git a/debian/patches/backup-vma-extract-add-block-driver-type.patch b/debian/patches/backup-vma-extract-add-block-driver-type.patch
new file mode 100644 (file)
index 0000000..98fd6f3
--- /dev/null
+++ b/debian/patches/backup-vma-extract-add-block-driver-type.patch
@@ -0,0 +1,19 @@
+Index: qemu-kvm-devel/vma.c
+===================================================================
+--- qemu-kvm-devel.orig/vma.c
++++ qemu-kvm-devel/vma.c
+@@ -299,7 +299,13 @@ static int extract_content(int argc, cha
+             }
+ 
+             BlockDriverState *bs = bdrv_new();
+-            if (errp || bdrv_open(&bs, devfn, NULL, NULL, flags, NULL, &errp)) {
++
++          char *tmp = g_strrstr(devfn, ".");
++          char *format = (tmp == NULL) ? "raw" : ++tmp;
++
++          BlockDriver *drv = bdrv_find_format(format);
++
++          if (errp || bdrv_open(&bs, devfn, NULL, NULL, flags, drv, &errp)) {
+                 g_error("can't open file %s - %s", devfn,
+                         error_get_pretty(errp));
+             }

diff --git a/debian/patches/series b/debian/patches/series
index 292bba6edc19b3d83ce2abd9e073555e5282c51e..791ac4596ebac0a64a5289fe1db322c098c7a18e 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,9 +26,9 @@ backup-do-not-use-bdrv-drain-all.patch
 internal-snapshot-async.patch
 disable-efi-enable-pxe-roms.patch
 backup-vma-allow-empty-backups.patch
+backup-vma-extract-add-block-driver-type.patch
 glusterfs-daemonize.patch
 gluster-backupserver.patch
 add-qmp-get-link-status.patch
 0001-friendlier-ai_flag-hints-for-ipv6-hosts.patch
 tcmalloc.patch
-add_block_driver_type_to_extract