Index: new/Makefile.objs
===================================================================
---- new.orig/Makefile.objs 2014-07-16 12:01:32.000000000 +0200
-+++ new/Makefile.objs 2014-07-16 12:01:37.000000000 +0200
+--- new.orig/Makefile.objs 2014-08-07 11:56:07.000000000 +0200
++++ new/Makefile.objs 2014-08-07 11:56:38.000000000 +0200
@@ -57,6 +57,7 @@
common-obj-y += qemu-char.o #aio.o
common-obj-y += block-migration.o
Index: new/block.c
===================================================================
---- new.orig/block.c 2014-07-16 11:53:55.000000000 +0200
-+++ new/block.c 2014-07-16 12:01:37.000000000 +0200
-@@ -2070,7 +2070,7 @@
+--- new.orig/block.c 2014-08-02 15:03:20.000000000 +0200
++++ new/block.c 2014-08-07 11:56:38.000000000 +0200
+@@ -2083,7 +2083,7 @@
bdrv_set_backing_hd(bs_top, bs_new);
}
assert(!bs->job);
Index: new/hmp-commands.hx
===================================================================
---- new.orig/hmp-commands.hx 2014-07-16 12:01:35.000000000 +0200
-+++ new/hmp-commands.hx 2014-07-16 12:01:37.000000000 +0200
+--- new.orig/hmp-commands.hx 2014-08-07 11:56:20.000000000 +0200
++++ new/hmp-commands.hx 2014-08-07 11:56:38.000000000 +0200
@@ -1803,6 +1803,8 @@
show current migration capabilities
@item info migrate_cache_size
+ },
Index: new/hmp.c
===================================================================
---- new.orig/hmp.c 2014-07-16 12:01:35.000000000 +0200
-+++ new/hmp.c 2014-07-16 12:01:37.000000000 +0200
+--- new.orig/hmp.c 2014-08-07 11:56:20.000000000 +0200
++++ new/hmp.c 2014-08-07 11:56:38.000000000 +0200
@@ -1805,3 +1805,60 @@
monitor_printf(mon, "\n");
+}
Index: new/hmp.h
===================================================================
---- new.orig/hmp.h 2014-07-16 12:01:34.000000000 +0200
-+++ new/hmp.h 2014-07-16 12:01:37.000000000 +0200
+--- new.orig/hmp.h 2014-08-07 11:56:19.000000000 +0200
++++ new/hmp.h 2014-08-07 11:56:38.000000000 +0200
@@ -26,6 +26,7 @@
void hmp_info_uuid(Monitor *mon, const QDict *qdict);
void hmp_info_chardev(Monitor *mon, const QDict *qdict);
void hmp_nbd_server_start(Monitor *mon, const QDict *qdict);
Index: new/include/block/block.h
===================================================================
---- new.orig/include/block/block.h 2014-07-16 11:53:55.000000000 +0200
-+++ new/include/block/block.h 2014-07-16 12:01:37.000000000 +0200
+--- new.orig/include/block/block.h 2014-08-02 15:03:21.000000000 +0200
++++ new/include/block/block.h 2014-08-07 11:56:38.000000000 +0200
@@ -275,6 +275,7 @@
const char *backing_file);
int bdrv_get_backing_file_depth(BlockDriverState *bs);
void bdrv_get_geometry(BlockDriverState *bs, uint64_t *nb_sectors_ptr);
Index: new/include/sysemu/sysemu.h
===================================================================
---- new.orig/include/sysemu/sysemu.h 2014-07-16 11:53:55.000000000 +0200
-+++ new/include/sysemu/sysemu.h 2014-07-16 12:01:37.000000000 +0200
+--- new.orig/include/sysemu/sysemu.h 2014-08-02 15:03:21.000000000 +0200
++++ new/include/sysemu/sysemu.h 2014-08-07 11:56:38.000000000 +0200
@@ -76,16 +76,17 @@
void do_savevm(Monitor *mon, const QDict *qdict);
int qemu_loadvm_state(QEMUFile *f);
Index: new/monitor.c
===================================================================
---- new.orig/monitor.c 2014-07-16 12:01:34.000000000 +0200
-+++ new/monitor.c 2014-07-16 12:01:37.000000000 +0200
+--- new.orig/monitor.c 2014-08-07 11:56:19.000000000 +0200
++++ new/monitor.c 2014-08-07 11:56:38.000000000 +0200
@@ -2876,6 +2876,13 @@
.mhandler.cmd = hmp_info_migrate_cache_size,
},
.params = "",
Index: new/qapi-schema.json
===================================================================
---- new.orig/qapi-schema.json 2014-07-16 12:01:35.000000000 +0200
-+++ new/qapi-schema.json 2014-07-16 12:01:37.000000000 +0200
+--- new.orig/qapi-schema.json 2014-08-07 11:56:20.000000000 +0200
++++ new/qapi-schema.json 2014-08-07 11:56:38.000000000 +0200
@@ -547,6 +547,42 @@
'*downtime': 'int',
'*setup-time': 'int'} }
#
Index: new/qemu-options.hx
===================================================================
---- new.orig/qemu-options.hx 2014-07-16 12:01:27.000000000 +0200
-+++ new/qemu-options.hx 2014-07-16 12:01:37.000000000 +0200
+--- new.orig/qemu-options.hx 2014-08-07 11:55:39.000000000 +0200
++++ new/qemu-options.hx 2014-08-07 11:56:38.000000000 +0200
@@ -2951,6 +2951,19 @@
Start right away with a saved state (@code{loadvm} in monitor)
ETEXI
"-daemonize daemonize QEMU after initializing\n", QEMU_ARCH_ALL)
Index: new/qmp-commands.hx
===================================================================
---- new.orig/qmp-commands.hx 2014-07-16 12:01:34.000000000 +0200
-+++ new/qmp-commands.hx 2014-07-16 12:01:37.000000000 +0200
+--- new.orig/qmp-commands.hx 2014-08-07 11:56:19.000000000 +0200
++++ new/qmp-commands.hx 2014-08-07 11:56:38.000000000 +0200
@@ -3786,3 +3786,34 @@
<- { "return": {} }
Index: new/savevm-async.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ new/savevm-async.c 2014-07-16 12:01:37.000000000 +0200
++++ new/savevm-async.c 2014-08-07 11:56:38.000000000 +0200
@@ -0,0 +1,486 @@
+#include "qemu-common.h"
+#include "qapi/qmp/qerror.h"
+}
Index: new/savevm.c
===================================================================
---- new.orig/savevm.c 2014-07-16 11:53:55.000000000 +0200
-+++ new/savevm.c 2014-07-16 12:01:37.000000000 +0200
+--- new.orig/savevm.c 2014-08-02 15:03:21.000000000 +0200
++++ new/savevm.c 2014-08-07 11:56:38.000000000 +0200
@@ -596,11 +596,11 @@
return false;
}
uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size)
Index: new/vl.c
===================================================================
---- new.orig/vl.c 2014-07-16 12:01:30.000000000 +0200
-+++ new/vl.c 2014-07-16 12:01:37.000000000 +0200
-@@ -2920,6 +2920,7 @@
+--- new.orig/vl.c 2014-08-07 11:55:57.000000000 +0200
++++ new/vl.c 2014-08-07 11:56:38.000000000 +0200
+@@ -2930,6 +2930,7 @@
int optind;
const char *optarg;
const char *loadvm = NULL;
MachineClass *machine_class;
const char *cpu_model;
const char *vga_model = NULL;
-@@ -3614,6 +3615,9 @@
+@@ -3625,6 +3626,9 @@
case QEMU_OPTION_loadvm:
loadvm = optarg;
break;
case QEMU_OPTION_full_screen:
full_screen = 1;
break;
-@@ -4558,6 +4562,10 @@
+@@ -4569,6 +4573,10 @@
if (load_vmstate(loadvm) < 0) {
autostart = 0;
}