-Index: new/qapi-schema.json
+From 46fd4bb673a91d40352c95e9d3f62f63b5021053 Mon Sep 17 00:00:00 2001
+From: Stefan Priebe <s.priebe@profihost.ag>
+Date: Fri, 29 Nov 2013 22:17:03 +0100
+Subject: [PATCH] internal-snapshot-async-qemu1.7.patch
+
+---
+ Makefile.objs | 1 +
+ block.c | 2 +-
+ hmp-commands.hx | 34 ++++
+ hmp.c | 57 ++++++
+ hmp.h | 5 +
+ include/block/block.h | 1 +
+ include/sysemu/sysemu.h | 5 +-
+ monitor.c | 7 +
+ qapi-schema.json | 46 +++++
+ qemu-options.hx | 13 ++
+ qmp-commands.hx | 31 +++
+ savevm-async.c | 478 +++++++++++++++++++++++++++++++++++++++++++++++
+ savevm.c | 10 +-
+ vl.c | 9 +
+ 14 files changed, 692 insertions(+), 7 deletions(-)
+ create mode 100644 savevm-async.c
+
+Index: new/Makefile.objs
===================================================================
---- new.orig/qapi-schema.json 2012-09-24 06:12:15.000000000 +0200
-+++ new/qapi-schema.json 2012-09-24 06:14:10.000000000 +0200
-@@ -358,6 +358,40 @@
- '*total-time': 'int'} }
+--- 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
+ common-obj-y += page_cache.o xbzrle.o
++common-obj-y += savevm-async.o
- ##
-+# @SaveVMInfo
-+#
-+# Information about current migration process.
-+#
-+# @status: #optional string describing the current savevm status.
-+# This can be 'active', 'completed', 'failed'.
-+# If this field is not returned, no savevm process
-+# has been initiated
-+#
-+# @error: #optional string containing error message is status is failed.
-+#
-+# @total-time: #optional total amount of milliseconds since savevm started.
-+# If savevm has ended, it returns the total save time
-+#
-+# @bytes: #optional total amount of data transfered
-+#
-+# Since: 1.3
-+##
-+{ 'type': 'SaveVMInfo',
-+ 'data': {'*status': 'str', '*error': 'str',
-+ '*total-time': 'int', '*bytes': 'int'} }
-+
-+##
-+# @query-savevm
-+#
-+# Returns information about current savevm process.
-+#
-+# Returns: @SaveVMInfo
-+#
-+# Since: 1.3
-+##
-+{ 'command': 'query-savevm', 'returns': 'SaveVMInfo' }
-+
-+##
- # @query-migrate
- #
- # Returns information about current migration process.
-@@ -2493,3 +2527,12 @@
- # Since: 1.2.0
- ##
- { 'command': 'query-target', 'returns': 'TargetInfo' }
-+
-+
-+{ 'command': 'savevm-start' 'data': { '*statefile': 'str' } }
-+
-+{ 'command': 'snapshot-drive', 'data': { 'device': 'str', 'name': 'str' } }
-+
-+{ 'command': 'delete-drive-snapshot', 'data': { 'device': 'str', 'name': 'str' } }
-+
-+{ 'command': 'savevm-end' }
-Index: new/qmp-commands.hx
+ common-obj-$(CONFIG_POSIX) += migration-exec.o migration-unix.o migration-fd.o
+
+Index: new/block.c
===================================================================
---- new.orig/qmp-commands.hx 2012-09-24 06:12:15.000000000 +0200
-+++ new/qmp-commands.hx 2012-09-24 06:15:13.000000000 +0200
-@@ -2514,3 +2514,27 @@
- .args_type = "",
- .mhandler.cmd_new = qmp_marshal_input_query_target,
- },
+--- 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);
+ }
+
+-static void bdrv_delete(BlockDriverState *bs)
++void bdrv_delete(BlockDriverState *bs)
+ {
+ assert(!bs->dev);
+ assert(!bs->job);
+Index: new/hmp-commands.hx
+===================================================================
+--- 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
+ show current migration XBZRLE cache size
++@item info savevm
++show savevm status
+ @item info balloon
+ show balloon information
+ @item info qtree
+@@ -1824,3 +1826,35 @@
+ STEXI
+ @end table
+ ETEXI
+
+ {
+ .name = "savevm-start",
+ .args_type = "statefile:s?",
-+ .mhandler.cmd_new = qmp_marshal_input_savevm_start,
++ .params = "[statefile]",
++ .help = "Prepare for snapshot and halt VM. Save VM state to statefile.",
++ .mhandler.cmd = hmp_savevm_start,
+ },
+
+ {
+ .name = "snapshot-drive",
+ .args_type = "device:s,name:s",
-+ .mhandler.cmd_new = qmp_marshal_input_snapshot_drive,
++ .params = "device name",
++ .help = "Create internal snapshot.",
++ .mhandler.cmd = hmp_snapshot_drive,
+ },
+
+ {
+ .name = "delete-drive-snapshot",
+ .args_type = "device:s,name:s",
-+ .mhandler.cmd_new = qmp_marshal_input_delete_drive_snapshot,
++ .params = "device name",
++ .help = "Delete internal snapshot.",
++ .mhandler.cmd = hmp_delete_drive_snapshot,
+ },
+
+ {
+ .name = "savevm-end",
+ .args_type = "",
-+ .mhandler.cmd_new = qmp_marshal_input_savevm_end,
++ .params = "",
++ .help = "Resume VM after snaphot.",
++ .mhandler.cmd = hmp_savevm_end,
+ },
Index: new/hmp.c
===================================================================
---- new.orig/hmp.c 2012-09-24 06:12:15.000000000 +0200
-+++ new/hmp.c 2012-09-24 06:21:35.000000000 +0200
-@@ -1102,3 +1102,60 @@
- qmp_closefd(fdname, &errp);
- hmp_handle_error(mon, &errp);
+--- 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");
}
+
+void hmp_savevm_start(Monitor *mon, const QDict *qdict)
+ hmp_handle_error(mon, &errp);
+}
+
-+void hmp_info_savevm(Monitor *mon)
++void hmp_info_savevm(Monitor *mon, const QDict *qdict)
+{
+ SaveVMInfo *info;
+ info = qmp_query_savevm(NULL);
+}
Index: new/hmp.h
===================================================================
---- new.orig/hmp.h 2012-09-24 06:12:15.000000000 +0200
-+++ new/hmp.h 2012-09-24 06:23:00.000000000 +0200
-@@ -25,6 +25,7 @@
- void hmp_info_uuid(Monitor *mon);
- void hmp_info_chardev(Monitor *mon);
- void hmp_info_mice(Monitor *mon);
-+void hmp_info_savevm(Monitor *mon);
- void hmp_info_migrate(Monitor *mon);
- void hmp_info_migrate_capabilities(Monitor *mon);
- void hmp_info_migrate_cache_size(Monitor *mon);
-@@ -71,5 +72,9 @@
+--- 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_info_mice(Monitor *mon, const QDict *qdict);
++void hmp_info_savevm(Monitor *mon, const QDict *qdict);
+ void hmp_info_migrate(Monitor *mon, const QDict *qdict);
+ void hmp_info_migrate_capabilities(Monitor *mon, const QDict *qdict);
+ void hmp_info_migrate_cache_size(Monitor *mon, const QDict *qdict);
+@@ -85,6 +86,10 @@
void hmp_netdev_del(Monitor *mon, const QDict *qdict);
void hmp_getfd(Monitor *mon, const QDict *qdict);
void hmp_closefd(Monitor *mon, const QDict *qdict);
+void hmp_snapshot_drive(Monitor *mon, const QDict *qdict);
+void hmp_delete_drive_snapshot(Monitor *mon, const QDict *qdict);
+void hmp_savevm_end(Monitor *mon, const QDict *qdict);
+ void hmp_send_key(Monitor *mon, const QDict *qdict);
+ void hmp_screen_dump(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-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);
+ int bdrv_truncate(BlockDriverState *bs, int64_t offset);
++void bdrv_delete(BlockDriverState *bs);
+ int64_t bdrv_getlength(BlockDriverState *bs);
+ int64_t bdrv_get_allocated_file_size(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-08-02 15:03:21.000000000 +0200
++++ new/include/sysemu/sysemu.h 2014-08-07 11:56:38.000000000 +0200
+@@ -76,16 +76,17 @@
- #endif
-Index: new/hmp-commands.hx
+ void do_savevm(Monitor *mon, const QDict *qdict);
+ int load_vmstate(const char *name);
++int load_state_from_blockdev(const char *filename);
+ void do_delvm(Monitor *mon, const QDict *qdict);
+ void do_info_snapshots(Monitor *mon, const QDict *qdict);
+
+ void qemu_announce_self(void);
+
+ bool qemu_savevm_state_blocked(Error **errp);
+-void qemu_savevm_state_begin(QEMUFile *f,
++int qemu_savevm_state_begin(QEMUFile *f,
+ const MigrationParams *params);
+ int qemu_savevm_state_iterate(QEMUFile *f);
+-void qemu_savevm_state_complete(QEMUFile *f);
++int qemu_savevm_state_complete(QEMUFile *f);
+ void qemu_savevm_state_cancel(void);
+ uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size);
+ int qemu_loadvm_state(QEMUFile *f);
+Index: new/monitor.c
===================================================================
---- new.orig/hmp-commands.hx 2012-09-24 06:12:15.000000000 +0200
-+++ new/hmp-commands.hx 2012-09-24 06:16:14.000000000 +0200
-@@ -1468,6 +1468,8 @@
- show current migration capabilities
- @item info migrate_cache_size
- show current migration XBZRLE cache size
-+@item info savevm
-+show savevm status
- @item info balloon
- show balloon information
- @item info qtree
-@@ -1494,3 +1496,35 @@
- STEXI
- @end table
+--- 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,
+ },
+ {
++ .name = "savevm",
++ .args_type = "",
++ .params = "",
++ .help = "show savevm status",
++ .mhandler.cmd = hmp_info_savevm,
++ },
++ {
+ .name = "balloon",
+ .args_type = "",
+ .params = "",
+Index: new/qapi-schema.json
+===================================================================
+--- 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'} }
+
++
++# @SaveVMInfo
++#
++# Information about current migration process.
++#
++# @status: #optional string describing the current savevm status.
++# This can be 'active', 'completed', 'failed'.
++# If this field is not returned, no savevm process
++# has been initiated
++#
++# @error: #optional string containing error message is status is failed.
++#
++# @total-time: #optional total amount of milliseconds since savevm started.
++# If savevm has ended, it returns the total save time
++#
++# @bytes: #optional total amount of data transfered
++#
++# Since: 1.3
++##
++{ 'type': 'SaveVMInfo',
++ 'data': {'*status': 'str', '*error': 'str',
++ '*total-time': 'int', '*bytes': 'int'} }
++
++##
++# @query-savevm
++#
++# Returns information about current savevm process.
++#
++# Returns: @SaveVMInfo
++#
++# Since: 1.3
++##
++{ 'command': 'query-savevm', 'returns': 'SaveVMInfo' }
++
++##
++
+ ##
+ # @query-migrate
+ #
+@@ -2644,8 +2680,18 @@
+ #
+ # Since: 1.2.0
+ ##
++
+ { 'command': 'query-target', 'returns': 'TargetInfo' }
+
++{ 'command': 'savevm-start', 'data': { '*statefile': 'str' } }
++
++{ 'command': 'snapshot-drive', 'data': { 'device': 'str', 'name': 'str' } }
++
++{ 'command': 'delete-drive-snapshot', 'data': { 'device': 'str', 'name': 'str' } }
++
++{ 'command': 'savevm-end' }
++
++
+ ##
+ # @QKeyCode:
+ #
+Index: new/qemu-options.hx
+===================================================================
+--- 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
+
++DEF("loadstate", HAS_ARG, QEMU_OPTION_loadstate, \
++ "-loadstate file\n" \
++ " start right away with a saved state\n",
++ QEMU_ARCH_ALL)
++STEXI
++@item -loadstate @var{file}
++@findex -loadstate
++Start right away with a saved state. This option does not rollback
++disk state like @code{loadvm}, so user must make sure that disk
++have correct state. @var{file} can be any valid device URL. See the section
++for "Device URL Syntax" for more information.
++ETEXI
++
+ #ifndef _WIN32
+ DEF("daemonize", 0, QEMU_OPTION_daemonize, \
+ "-daemonize daemonize QEMU after initializing\n", QEMU_ARCH_ALL)
+Index: new/qmp-commands.hx
+===================================================================
+--- 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": {} }
+
+ EQMP
++
+
+ {
+ .name = "savevm-start",
+ .args_type = "statefile:s?",
-+ .params = "[statefile]",
-+ .help = "Prepare for snapshot and halt VM. Save VM state to statefile.",
-+ .mhandler.cmd = hmp_savevm_start,
++ .mhandler.cmd_new = qmp_marshal_input_savevm_start,
+ },
+
+ {
+ .name = "snapshot-drive",
+ .args_type = "device:s,name:s",
-+ .params = "device name",
-+ .help = "Create internal snapshot.",
-+ .mhandler.cmd = hmp_snapshot_drive,
++ .mhandler.cmd_new = qmp_marshal_input_snapshot_drive,
+ },
+
+ {
+ .name = "delete-drive-snapshot",
+ .args_type = "device:s,name:s",
-+ .params = "device name",
-+ .help = "Delete internal snapshot.",
-+ .mhandler.cmd = hmp_delete_drive_snapshot,
++ .mhandler.cmd_new = qmp_marshal_input_delete_drive_snapshot,
+ },
+
+ {
+ .name = "savevm-end",
+ .args_type = "",
-+ .params = "",
-+ .help = "Resume VM after snaphot.",
-+ .mhandler.cmd = hmp_savevm_end,
++ .mhandler.cmd_new = qmp_marshal_input_savevm_end,
++ },
++
++ {
++ .name = "query-savevm",
++ .args_type = "",
++ .mhandler.cmd_new = qmp_marshal_input_query_savevm,
+ },
Index: new/savevm-async.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ new/savevm-async.c 2012-09-24 06:19:58.000000000 +0200
-@@ -0,0 +1,441 @@
++++ new/savevm-async.c 2014-08-07 11:56:38.000000000 +0200
+@@ -0,0 +1,486 @@
+#include "qemu-common.h"
-+#include "qerror.h"
-+#include "sysemu.h"
++#include "qapi/qmp/qerror.h"
++#include "sysemu/sysemu.h"
+#include "qmp-commands.h"
-+#include "blockdev.h"
-+#include "qemu/qom-qobject.h"
-+#include "buffered_file.h"
-+#include "migration.h"
++#include "qemu-options.h"
++#include "migration/qemu-file.h"
++#include "qom/qom-qobject.h"
++#include "migration/migration.h"
++#include "block/snapshot.h"
++#include "block/qapi.h"
++#include "block/block.h"
++#include "qemu/timer.h"
+
-+//#define DEBUG_SAVEVM_STATE
++/* #define DEBUG_SAVEVM_STATE */
+
+#ifdef DEBUG_SAVEVM_STATE
+#define DPRINTF(fmt, ...) \
+ SAVE_STATE_COMPLETED,
+};
+
++
+static struct SnapshotState {
+ BlockDriverState *bs;
+ size_t bs_pos;
+ int state;
+ Error *error;
++ Error *blocker;
+ int saved_vm_running;
+ QEMUFile *file;
+ int64_t total_time;
+ info->has_status = true;
+ info->status = g_strdup("active");
+ info->has_total_time = true;
-+ info->total_time = qemu_get_clock_ms(rt_clock)
++ info->total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME)
+ - s->total_time;
+ break;
+ case SAVE_STATE_COMPLETED:
+
+ DPRINTF("save_snapshot_cleanup\n");
+
-+ snap_state.total_time = qemu_get_clock_ms(rt_clock) -
++ snap_state.total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME) -
+ snap_state.total_time;
+
+ if (snap_state.file) {
+ }
+
+ if (snap_state.bs) {
-+ // try to truncate, but ignore errors (will fail on block devices).
-+ // note: bdrv_read() need whole blocks, so we round up
++ /* try to truncate, but ignore errors (will fail on block devices).
++ * note: bdrv_read() need whole blocks, so we round up
++ */
+ size_t size = (snap_state.bs_pos + BDRV_SECTOR_SIZE) & BDRV_SECTOR_MASK;
+ bdrv_truncate(snap_state.bs, size);
-+
-+ bdrv_delete(snap_state.bs);
++ bdrv_op_unblock_all(snap_state.bs, snap_state.blocker);
++ error_free(snap_state.blocker);
++ snap_state.blocker = NULL;
++ bdrv_unref(snap_state.bs);
+ snap_state.bs = NULL;
+ }
+
+ return bdrv_flush(snap_state.bs);
+}
+
-+static ssize_t block_state_put_buffer(void *opaque, const void *buf,
-+ size_t size)
++static int block_state_put_buffer(void *opaque, const uint8_t *buf,
++ int64_t pos, int size)
+{
+ int ret;
+
++ assert(pos == snap_state.bs_pos);
++
+ if ((ret = bdrv_pwrite(snap_state.bs, snap_state.bs_pos, buf, size)) > 0) {
+ snap_state.bs_pos += ret;
+ }
+ return ret;
+}
+
-+static void block_state_put_ready(void *opaque)
++static void process_savevm_co(void *opaque)
+{
+ int ret;
++ int64_t maxlen;
++ MigrationParams params = {
++ .blk = 0,
++ .shared = 0
++ };
+
-+ if (snap_state.state != SAVE_STATE_ACTIVE) {
-+ save_snapshot_error("put_ready returning because of non-active state");
-+ return;
-+ }
++ snap_state.state = SAVE_STATE_ACTIVE;
+
-+ if (!runstate_check(RUN_STATE_SAVE_VM)) {
-+ save_snapshot_error("put_ready returning because of wrong run state");
-+ return;
-+ }
++ qemu_mutex_unlock_iothread();
++ ret = qemu_savevm_state_begin(snap_state.file, ¶ms);
++ qemu_mutex_lock_iothread();
+
-+ ret = qemu_savevm_state_iterate(snap_state.file);
+ if (ret < 0) {
-+ save_snapshot_error("qemu_savevm_state_iterate error %d", ret);
++ save_snapshot_error("qemu_savevm_state_begin failed");
+ return;
-+ } else if (ret == 1) {
-+ DPRINTF("savevm inerate finished\n");
-+ if ((ret = qemu_savevm_state_complete(snap_state.file)) < 0) {
-+ save_snapshot_error("qemu_savevm_state_complete error %d", ret);
-+ return;
++ }
++
++ while (snap_state.state == SAVE_STATE_ACTIVE) {
++ uint64_t pending_size;
++
++ pending_size = qemu_savevm_state_pending(snap_state.file, 0);
++
++ if (pending_size) {
++ ret = qemu_savevm_state_iterate(snap_state.file);
++ if (ret < 0) {
++ save_snapshot_error("qemu_savevm_state_iterate error %d", ret);
++ break;
++ }
++ DPRINTF("savevm inerate pending size %lu ret %d\n", pending_size, ret);
+ } else {
++ DPRINTF("done iterating\n");
++ if (runstate_is_running()) {
++ vm_stop(RUN_STATE_SAVE_VM);
++ }
++ DPRINTF("savevm inerate finished\n");
++ qemu_savevm_state_complete(snap_state.file);
+ DPRINTF("save complete\n");
+ save_snapshot_completed();
-+ return;
++ break;
++ }
++
++ /* stop the VM if we get to the end of available space,
++ * or if pending_size is just a few MB
++ */
++ maxlen = bdrv_getlength(snap_state.bs) - 30*1024*1024;
++ if ((pending_size < 100000) ||
++ ((snap_state.bs_pos + pending_size) >= maxlen)) {
++ if (runstate_is_running()) {
++ vm_stop(RUN_STATE_SAVE_VM);
++ }
+ }
+ }
+}
+
-+static void block_state_wait_for_unfreeze(void *opaque)
-+{
-+ /* do nothing here - should not be called */
-+}
++static const QEMUFileOps block_file_ops = {
++ .put_buffer = block_state_put_buffer,
++ .close = block_state_close,
++};
++
+
+void qmp_savevm_start(bool has_statefile, const char *statefile, Error **errp)
+{
+ BlockDriver *drv = NULL;
++ Error *local_err = NULL;
++
+ int bdrv_oflags = BDRV_O_CACHE_WB | BDRV_O_RDWR;
-+ MigrationParams params = {
-+ .blk = 0,
-+ .shared = 0
-+ };
+ int ret;
+
+ if (snap_state.state != SAVE_STATE_DONE) {
+ /* initialize snapshot info */
+ snap_state.saved_vm_running = runstate_is_running();
+ snap_state.bs_pos = 0;
-+ snap_state.total_time = qemu_get_clock_ms(rt_clock);
++ snap_state.total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
++ snap_state.blocker = NULL;
+
+ if (snap_state.error) {
+ error_free(snap_state.error);
+ snap_state.error = NULL;
+ }
+
-+ /* stop the VM */
-+ vm_stop(RUN_STATE_SAVE_VM);
-+
+ if (!has_statefile) {
++ vm_stop(RUN_STATE_SAVE_VM);
+ snap_state.state = SAVE_STATE_COMPLETED;
+ return;
+ }
+ }
+
+ /* Open the image */
-+ snap_state.bs = bdrv_new("vmstate");
-+ ret = bdrv_open(snap_state.bs, statefile, bdrv_oflags, drv);
++ snap_state.bs = bdrv_new("vmstate", &error_abort);
++ ret = bdrv_open(&snap_state.bs, statefile, NULL, NULL, bdrv_oflags, drv, &local_err);
++
+ if (ret < 0) {
-+ error_set(errp, QERR_OPEN_FILE_FAILED, statefile);
++ error_set(errp, ERROR_CLASS_GENERIC_ERROR, "failed to open '%s'", statefile);
+ goto restart;
+ }
+
-+ snap_state.file = qemu_fopen_ops_buffered(&snap_state, 1000, //000000,
-+ block_state_put_buffer,
-+ block_state_put_ready,
-+ block_state_wait_for_unfreeze,
-+ block_state_close);
++ snap_state.file = qemu_fopen_ops(&snap_state, &block_file_ops);
+
+ if (!snap_state.file) {
-+ error_set(errp, QERR_OPEN_FILE_FAILED, statefile);
++ error_set(errp, ERROR_CLASS_GENERIC_ERROR, "failed to open '%s'", statefile);
+ goto restart;
+ }
+
-+ snap_state.state = SAVE_STATE_ACTIVE;
+
-+ ret = qemu_savevm_state_begin(snap_state.file, ¶ms);
-+ if (ret < 0) {
-+ error_set(errp, ERROR_CLASS_GENERIC_ERROR,
-+ "qemu_savevm_state_begin failed\n");
-+ goto restart;
-+ }
++ error_setg(&snap_state.blocker, "block device is in use by savevm");
++ bdrv_op_block_all(snap_state.bs, snap_state.blocker);
++ bdrv_ref(snap_state.bs);
+
-+ block_state_put_ready(&snap_state);
++ Coroutine *co = qemu_coroutine_create(process_savevm_co);
++ qemu_coroutine_enter(co, NULL);
+
+ return;
+
+ }
+
+ if (!bdrv_can_snapshot(bs)) {
-+ error_set(errp, QERR_NOT_SUPPORTED);
++ error_set(errp, QERR_UNSUPPORTED);
+ return;
+ }
+
+ sn->date_sec = tv.tv_sec;
+ sn->date_nsec = tv.tv_usec * 1000;
+#endif
-+ sn->vm_clock_nsec = qemu_get_clock_ns(vm_clock);
++ sn->vm_clock_nsec = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
+
+ pstrcpy(sn->name, sizeof(sn->name), name);
+
+{
+ BlockDriverState *bs;
+ QEMUSnapshotInfo sn1, *sn = &sn1;
++ Error *local_err = NULL;
++
+ int ret;
+
+ bs = bdrv_find(device);
+ }
+
+ if (!bdrv_can_snapshot(bs)) {
-+ error_set(errp, QERR_NOT_SUPPORTED);
++ error_set(errp, QERR_UNSUPPORTED);
+ return;
+ }
+
+ return;
+ }
+
-+ ret = bdrv_snapshot_delete(bs, name);
++ ret = bdrv_snapshot_delete(bs, NULL, name, &local_err);
+ if (ret < 0) {
+ error_set(errp, ERROR_CLASS_GENERIC_ERROR,
+ "Error while deleting snapshot on '%s'\n", device);
+ }
+}
+
-+static int loadstate_get_buffer(void *opaque, uint8_t *buf, int64_t pos, int size)
++static int loadstate_get_buffer(void *opaque, uint8_t *buf, int64_t pos,
++ int size)
+{
+ BlockDriverState *bs = (BlockDriverState *)opaque;
+ int64_t maxlen = bdrv_getlength(bs);
+ return bdrv_pread(bs, pos, buf, size);
+}
+
++static const QEMUFileOps loadstate_file_ops = {
++ .get_buffer = loadstate_get_buffer,
++};
++
+int load_state_from_blockdev(const char *filename)
+{
+ BlockDriverState *bs = NULL;
+ BlockDriver *drv = NULL;
++ Error *local_err = NULL;
++ Error *blocker = NULL;
++
+ QEMUFile *f;
+ int ret = -1;
+
-+ bs = bdrv_new("vmstate");
-+ ret = bdrv_open(bs, filename, BDRV_O_CACHE_WB, drv);
++ bs = bdrv_new("vmstate", &error_abort);
++ ret = bdrv_open(&bs, filename, NULL, NULL, BDRV_O_CACHE_WB, drv, &local_err);
++ error_setg(&blocker, "block device is in use by load state");
++ bdrv_op_block_all(bs, blocker);
++ bdrv_ref(bs);
++
+ if (ret < 0) {
+ error_report("Could not open VM state file");
+ goto the_end;
+ }
+
+ /* restore the VM state */
-+ f = qemu_fopen_ops(bs, NULL, loadstate_get_buffer, NULL, NULL, NULL, NULL);
++ f = qemu_fopen_ops(bs, &loadstate_file_ops);
+ if (!f) {
+ error_report("Could not open VM state file");
+ ret = -EINVAL;
+
+ the_end:
+ if (bs) {
-+ bdrv_delete(bs);
++ bdrv_op_unblock_all(bs, blocker);
++ error_free(blocker);
++ bdrv_unref(bs);
+ }
+ return ret;
+}
-Index: new/Makefile.objs
+Index: new/savevm.c
===================================================================
---- new.orig/Makefile.objs 2012-09-24 06:12:15.000000000 +0200
-+++ new/Makefile.objs 2012-09-24 06:12:21.000000000 +0200
-@@ -78,6 +78,7 @@
- common-obj-y += pflib.o
- common-obj-y += bitmap.o bitops.o
- common-obj-y += page_cache.o
-+common-obj-y += savevm-async.o
+--- 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;
+ }
- common-obj-$(CONFIG_POSIX) += migration-exec.o migration-unix.o migration-fd.o
- common-obj-$(CONFIG_WIN32) += version.o
-Index: new/sysemu.h
-===================================================================
---- new.orig/sysemu.h 2012-09-24 06:12:15.000000000 +0200
-+++ new/sysemu.h 2012-09-24 06:12:21.000000000 +0200
-@@ -72,6 +72,7 @@
+-void qemu_savevm_state_begin(QEMUFile *f,
++int qemu_savevm_state_begin(QEMUFile *f,
+ const MigrationParams *params)
+ {
+ SaveStateEntry *se;
+- int ret;
++ int ret = 0;
- void do_savevm(Monitor *mon, const QDict *qdict);
- int load_vmstate(const char *name);
-+int load_state_from_blockdev(const char *filename);
- void do_delvm(Monitor *mon, const QDict *qdict);
- void do_info_snapshots(Monitor *mon);
+ trace_savevm_state_begin();
+ QTAILQ_FOREACH(se, &savevm_handlers, entry) {
+@@ -642,6 +642,7 @@
+ break;
+ }
+ }
++ return ret;
+ }
-Index: new/qemu-options.hx
-===================================================================
---- new.orig/qemu-options.hx 2012-09-24 06:12:21.000000000 +0200
-+++ new/qemu-options.hx 2012-09-24 06:12:21.000000000 +0200
-@@ -2477,6 +2477,19 @@
- Start right away with a saved state (@code{loadvm} in monitor)
- ETEXI
+ /*
+@@ -690,7 +691,7 @@
+ return ret;
+ }
-+DEF("loadstate", HAS_ARG, QEMU_OPTION_loadstate, \
-+ "-loadstate file\n" \
-+ " start right away with a saved state\n",
-+ QEMU_ARCH_ALL)
-+STEXI
-+@item -loadstate @var{file}
-+@findex -loadstate
-+Start right away with a saved state. This option does not rollback
-+disk state like @code{loadvm}, so user must make sure that disk
-+have correct state. @var{file} can be any valid device URL. See the section
-+for "Device URL Syntax" for more information.
-+ETEXI
-+
- #ifndef _WIN32
- DEF("daemonize", 0, QEMU_OPTION_daemonize, \
- "-daemonize daemonize QEMU after initializing\n", QEMU_ARCH_ALL)
+-void qemu_savevm_state_complete(QEMUFile *f)
++int qemu_savevm_state_complete(QEMUFile *f)
+ {
+ SaveStateEntry *se;
+ int ret;
+@@ -717,7 +718,7 @@
+ trace_savevm_section_end(se->idstr, se->section_id);
+ if (ret < 0) {
+ qemu_file_set_error(f, ret);
+- return;
++ return ret;
+ }
+ }
+
+@@ -746,6 +747,7 @@
+
+ qemu_put_byte(f, QEMU_VM_EOF);
+ qemu_fflush(f);
++ return qemu_file_get_error(f);
+ }
+
+ uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size)
Index: new/vl.c
===================================================================
---- new.orig/vl.c 2012-09-24 06:12:21.000000000 +0200
-+++ new/vl.c 2012-09-24 06:12:21.000000000 +0200
-@@ -2364,6 +2364,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;
+ const char *loadstate = NULL;
- QEMUMachine *machine;
+ MachineClass *machine_class;
const char *cpu_model;
- const char *vga_model = "none";
-@@ -2998,6 +2999,9 @@
+ const char *vga_model = NULL;
+@@ -3625,6 +3626,9 @@
case QEMU_OPTION_loadvm:
loadvm = optarg;
break;
case QEMU_OPTION_full_screen:
full_screen = 1;
break;
-@@ -3821,6 +3825,10 @@
+@@ -4569,6 +4573,10 @@
if (load_vmstate(loadvm) < 0) {
autostart = 0;
}
+ }
}
- if (incoming) {
+ qdev_prop_check_global();
projects / pve-qemu-kvm.git / blobdiff