-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 +
+ .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);
}
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,
+ 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;
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;
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;
}