update to qemu 2.7.1

[pve-qemu-kvm.git] / debian / patches / pve / 0022-internal-snapshot-async.patch

diff --git a/debian/patches/pve/0022-internal-snapshot-async.patch b/debian/patches/pve/0022-internal-snapshot-async.patch
index 6dfb8a3d735514c3450e5e05895263302542aafc..3c7cfcb9f8e37ad53bb2cce422f898f0c5c9d62c 100644 (file)
--- a/debian/patches/pve/0022-internal-snapshot-async.patch
+++ b/debian/patches/pve/0022-internal-snapshot-async.patch
@@ -1,7 +1,7 @@
-From 3c93adeb6d594c56619fd34dc345dffa3139c2cb Mon Sep 17 00:00:00 2001
+From ddfc29076293a794f0d9cc74c0c822c144e7ecbc Mon Sep 17 00:00:00 2001
 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
 Date: Wed, 9 Dec 2015 16:04:32 +0100
-Subject: [PATCH 22/41] internal snapshot async
+Subject: [PATCH 22/47] internal snapshot async
 
 ---
  Makefile.objs           |   1 +
@@ -111,10 +111,10 @@ index 0e20ef9..4d735cb 100644
 +        .mhandler.cmd = hmp_savevm_end,
 +    },
 diff --git a/hmp.c b/hmp.c
-index c292354..7bd319f 100644
+index c23cf2f..030fd97 100644
 --- a/hmp.c
 +++ b/hmp.c
-@@ -2116,6 +2116,63 @@ void hmp_info_memory_devices(Monitor *mon, const QDict *qdict)
+@@ -2117,6 +2117,63 @@ void hmp_info_memory_devices(Monitor *mon, const QDict *qdict)
      qapi_free_MemoryDeviceInfoList(info_list);
  }
  
@@ -202,7 +202,7 @@ index 9a4c1f6..b74ddbf 100644
  void hmp_screendump(Monitor *mon, const QDict *qdict);
  void hmp_nbd_server_start(Monitor *mon, const QDict *qdict);
 diff --git a/include/block/block.h b/include/block/block.h
-index 11c162d..6822b91 100644
+index acddf3b..0f70a9d 100644
 --- a/include/block/block.h
 +++ b/include/block/block.h
 @@ -256,6 +256,7 @@ BlockDriverState *bdrv_find_backing_image(BlockDriverState *bs,
@@ -963,10 +963,10 @@ index 0000000..ae7ea84
 +    return ret;
 +}
 diff --git a/vl.c b/vl.c
-index bdf4fdc..85033e3 100644
+index b226e0b..c01b1b5 100644
 --- a/vl.c
 +++ b/vl.c
-@@ -2948,6 +2948,7 @@ int main(int argc, char **argv, char **envp)
+@@ -2962,6 +2962,7 @@ int main(int argc, char **argv, char **envp)
      int optind;
      const char *optarg;
      const char *loadvm = NULL;
@@ -974,7 +974,7 @@ index bdf4fdc..85033e3 100644
      MachineClass *machine_class;
      const char *cpu_model;
      const char *vga_model = NULL;
-@@ -3589,6 +3590,9 @@ int main(int argc, char **argv, char **envp)
+@@ -3603,6 +3604,9 @@ int main(int argc, char **argv, char **envp)
              case QEMU_OPTION_loadvm:
                  loadvm = optarg;
                  break;
@@ -984,7 +984,7 @@ index bdf4fdc..85033e3 100644
              case QEMU_OPTION_full_screen:
                  full_screen = 1;
                  break;
-@@ -4583,6 +4587,10 @@ int main(int argc, char **argv, char **envp)
+@@ -4597,6 +4601,10 @@ int main(int argc, char **argv, char **envp)
          if (load_vmstate(loadvm) < 0) {
              autostart = 0;
          }