Update and rebase to QEMU 4.1

[pve-qemu.git] / debian / patches / pve / 0012-PVE-Up-qemu-img-dd-add-isize-parameter.patch

diff --git a/debian/patches/pve/0012-PVE-Up-qemu-img-dd-add-isize-parameter.patch b/debian/patches/pve/0012-PVE-Up-qemu-img-dd-add-isize-parameter.patch
index 1532c20d9f69fd9a7ff125e5b1e538b4cb0246ec..dfd592f02d7b492d34d2760b7bf3724762d30313 100644 (file)
--- a/debian/patches/pve/0012-PVE-Up-qemu-img-dd-add-isize-parameter.patch
+++ b/debian/patches/pve/0012-PVE-Up-qemu-img-dd-add-isize-parameter.patch
@@ -15,10 +15,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 26 insertions(+), 3 deletions(-)
 
 diff --git a/qemu-img.c b/qemu-img.c
-index 6e1a3b8933..6a76897c01 100644
+index 8129677d7a..1b7f211368 100644
 --- a/qemu-img.c
 +++ b/qemu-img.c
-@@ -4314,11 +4314,13 @@ out:
+@@ -4414,11 +4414,13 @@ out:
  #define C_OF      010
  #define C_SKIP    020
  #define C_OSIZE   040
@@ -32,7 +32,7 @@ index 6e1a3b8933..6a76897c01 100644
  };
  
  struct DdIo {
-@@ -4411,6 +4413,20 @@ static int img_dd_osize(const char *arg,
+@@ -4511,6 +4513,20 @@ static int img_dd_osize(const char *arg,
      return 0;
  }
  
@@ -53,7 +53,7 @@ index 6e1a3b8933..6a76897c01 100644
  static int img_dd(int argc, char **argv)
  {
      int ret = 0;
-@@ -4425,12 +4441,14 @@ static int img_dd(int argc, char **argv)
+@@ -4525,12 +4541,14 @@ static int img_dd(int argc, char **argv)
      int c, i;
      const char *out_fmt = "raw";
      const char *fmt = NULL;
@@ -69,7 +69,7 @@ index 6e1a3b8933..6a76897c01 100644
      };
      struct DdIo in = {
          .bsz = 512, /* Block size is by default 512 bytes */
-@@ -4452,6 +4470,7 @@ static int img_dd(int argc, char **argv)
+@@ -4552,6 +4570,7 @@ static int img_dd(int argc, char **argv)
          { "of", img_dd_of, C_OF },
          { "skip", img_dd_skip, C_SKIP },
          { "osize", img_dd_osize, C_OSIZE },
@@ -77,7 +77,7 @@ index 6e1a3b8933..6a76897c01 100644
          { NULL, NULL, 0 }
      };
      const struct option long_options[] = {
-@@ -4658,14 +4677,18 @@ static int img_dd(int argc, char **argv)
+@@ -4758,14 +4777,18 @@ static int img_dd(int argc, char **argv)
  
      in.buf = g_new(uint8_t, in.bsz);