update to qemu-2.9.0-rc2

[pve-qemu-kvm.git] / debian / patches / pve / 0034-vma-add-format-option-to-device-mapping.patch

diff --git a/debian/patches/pve/0034-vma-add-format-option-to-device-mapping.patch b/debian/patches/pve/0034-vma-add-format-option-to-device-mapping.patch
index 90b75aec62d41d47b2dda9d22b6c370ab694fabe..4275a2ab0a530dbac9f59b632454cb92744c1fc8 100644 (file)
--- a/debian/patches/pve/0034-vma-add-format-option-to-device-mapping.patch
+++ b/debian/patches/pve/0034-vma-add-format-option-to-device-mapping.patch
@@ -1,4 +1,4 @@
-From 10ae69c411df788752628c8950bf9e76c8cf6af1 Mon Sep 17 00:00:00 2001
+From 87c344c964eac376a816b081acb6796893ce0992 Mon Sep 17 00:00:00 2001
 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
 Date: Tue, 12 Apr 2016 13:49:44 +0200
 Subject: [PATCH 34/47] vma: add format option to device mapping
@@ -15,10 +15,10 @@ silence the warnings by passing the drive mapping.
  1 file changed, 27 insertions(+), 7 deletions(-)
 
 diff --git a/vma.c b/vma.c
-index 8a27704..c8ad6c0 100644
+index 4903568..f71e5a5 100644
 --- a/vma.c
 +++ b/vma.c
-@@ -130,6 +130,7 @@ static int list_content(int argc, char **argv)
+@@ -131,6 +131,7 @@ static int list_content(int argc, char **argv)
  typedef struct RestoreMap {
      char *devname;
      char *path;
@@ -26,7 +26,7 @@ index 8a27704..c8ad6c0 100644
      bool write_zero;
  } RestoreMap;
  
-@@ -217,13 +218,24 @@ static int extract_content(int argc, char **argv)
+@@ -218,13 +219,24 @@ static int extract_content(int argc, char **argv)
                  }
              }
  
@@ -53,7 +53,7 @@ index 8a27704..c8ad6c0 100644
                  write_zero = true;
              } else {
                  g_error("read map failed - parse error ('%s')", inbuf);
-@@ -239,6 +251,7 @@ static int extract_content(int argc, char **argv)
+@@ -240,6 +252,7 @@ static int extract_content(int argc, char **argv)
              RestoreMap *map = g_new0(RestoreMap, 1);
              map->devname = g_strdup(devname);
              map->path = g_strdup(path);
@@ -61,7 +61,7 @@ index 8a27704..c8ad6c0 100644
              map->write_zero = write_zero;
  
              g_hash_table_insert(devmap, map->devname, map);
-@@ -263,6 +276,7 @@ static int extract_content(int argc, char **argv)
+@@ -264,6 +277,7 @@ static int extract_content(int argc, char **argv)
              g_free(statefn);
          } else if (di) {
              char *devfn = NULL;
@@ -69,7 +69,7 @@ index 8a27704..c8ad6c0 100644
              int flags = BDRV_O_RDWR;
              bool write_zero = true;
  
-@@ -273,6 +287,7 @@ static int extract_content(int argc, char **argv)
+@@ -274,6 +288,7 @@ static int extract_content(int argc, char **argv)
                      g_error("no device name mapping for %s", di->devname);
                  }
                  devfn = map->path;
@@ -77,7 +77,7 @@ index 8a27704..c8ad6c0 100644
                  write_zero = map->write_zero;
              } else {
                  devfn = g_strdup_printf("%s/tmp-disk-%s.raw",
-@@ -295,15 +310,20 @@ static int extract_content(int argc, char **argv)
+@@ -296,15 +311,20 @@ static int extract_content(int argc, char **argv)
              BlockDriverState *bs = bdrv_new();
  
            size_t devlen = strlen(devfn);