]> git.proxmox.com Git - pve-qemu-kvm.git/blob - debian/patches/internal-snapshot-async.patch
projects / pve-qemu-kvm.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
blame | history | raw | HEAD
remove mirror-sleep patches (now upstream)
[pve-qemu-kvm.git] / debian / patches / internal-snapshot-async.patch
1 From 46fd4bb673a91d40352c95e9d3f62f63b5021053 Mon Sep 17 00:00:00 2001
2 From: Stefan Priebe <s.priebe@profihost.ag>
3 Date: Fri, 29 Nov 2013 22:17:03 +0100
4 Subject: [PATCH] internal-snapshot-async-qemu1.7.patch
5
6 ---
7 Makefile.objs | 1 +
8 block.c | 2 +-
9 hmp-commands.hx | 34 ++++
10 hmp.c | 57 ++++++
11 hmp.h | 5 +
12 include/block/block.h | 1 +
13 include/sysemu/sysemu.h | 5 +-
14 monitor.c | 7 +
15 qapi-schema.json | 46 +++++
16 qemu-options.hx | 13 ++
17 qmp-commands.hx | 31 +++
18 savevm-async.c | 478 +++++++++++++++++++++++++++++++++++++++++++++++
19 savevm.c | 10 +-
20 vl.c | 9 +
21 14 files changed, 692 insertions(+), 7 deletions(-)
22 create mode 100644 savevm-async.c
23
24 Index: new/Makefile.objs
25 ===================================================================
26 --- new.orig/Makefile.objs 2014-11-20 09:13:01.000000000 +0100
27 +++ new/Makefile.objs 2014-11-20 09:16:47.000000000 +0100
28 @@ -53,6 +53,7 @@
29 common-obj-y += qemu-char.o #aio.o
30 common-obj-y += page_cache.o
31 common-obj-y += qjson.o
32 +common-obj-y += savevm-async.o
33
34 common-obj-$(CONFIG_SPICE) += spice-qemu-char.o
35
36 Index: new/block.c
37 ===================================================================
38 --- new.orig/block.c 2014-11-20 09:13:01.000000000 +0100
39 +++ new/block.c 2014-11-20 09:16:47.000000000 +0100
40 @@ -2202,7 +2202,7 @@
41 bdrv_attach_child(bs_top, bs_new, &child_backing);
42 }
43
44 -static void bdrv_delete(BlockDriverState *bs)
45 +void bdrv_delete(BlockDriverState *bs)
46 {
47 assert(!bs->job);
48 assert(bdrv_op_blocker_is_empty(bs));
49 Index: new/hmp-commands.hx
50 ===================================================================
51 --- new.orig/hmp-commands.hx 2014-11-20 09:13:01.000000000 +0100
52 +++ new/hmp-commands.hx 2014-11-20 09:16:47.000000000 +0100
53 @@ -1809,6 +1809,8 @@
54 show current migration parameters
55 @item info migrate_cache_size
56 show current migration XBZRLE cache size
57 +@item info savevm
58 +show savevm status
59 @item info balloon
60 show balloon information
61 @item info qtree
62 @@ -1857,3 +1859,35 @@
63 STEXI
64 @end table
65 ETEXI
66 +
67 + {
68 + .name = "savevm-start",
69 + .args_type = "statefile:s?",
70 + .params = "[statefile]",
71 + .help = "Prepare for snapshot and halt VM. Save VM state to statefile.",
72 + .mhandler.cmd = hmp_savevm_start,
73 + },
74 +
75 + {
76 + .name = "snapshot-drive",
77 + .args_type = "device:s,name:s",
78 + .params = "device name",
79 + .help = "Create internal snapshot.",
80 + .mhandler.cmd = hmp_snapshot_drive,
81 + },
82 +
83 + {
84 + .name = "delete-drive-snapshot",
85 + .args_type = "device:s,name:s",
86 + .params = "device name",
87 + .help = "Delete internal snapshot.",
88 + .mhandler.cmd = hmp_delete_drive_snapshot,
89 + },
90 +
91 + {
92 + .name = "savevm-end",
93 + .args_type = "",
94 + .params = "",
95 + .help = "Resume VM after snaphot.",
96 + .mhandler.cmd = hmp_savevm_end,
97 + },
98 Index: new/hmp.c
99 ===================================================================
100 --- new.orig/hmp.c 2014-11-20 09:13:01.000000000 +0100
101 +++ new/hmp.c 2014-11-20 09:16:47.000000000 +0100
102 @@ -1849,6 +1849,63 @@
103
104 qapi_free_MemoryDeviceInfoList(info_list);
105 }
106 +
107 +void hmp_savevm_start(Monitor *mon, const QDict *qdict)
108 +{
109 + Error *errp = NULL;
110 + const char *statefile = qdict_get_try_str(qdict, "statefile");
111 +
112 + qmp_savevm_start(statefile != NULL, statefile, &errp);
113 + hmp_handle_error(mon, &errp);
114 +}
115 +
116 +void hmp_snapshot_drive(Monitor *mon, const QDict *qdict)
117 +{
118 + Error *errp = NULL;
119 + const char *name = qdict_get_str(qdict, "name");
120 + const char *device = qdict_get_str(qdict, "device");
121 +
122 + qmp_snapshot_drive(device, name, &errp);
123 + hmp_handle_error(mon, &errp);
124 +}
125 +
126 +void hmp_delete_drive_snapshot(Monitor *mon, const QDict *qdict)
127 +{
128 + Error *errp = NULL;
129 + const char *name = qdict_get_str(qdict, "name");
130 + const char *device = qdict_get_str(qdict, "device");
131 +
132 + qmp_delete_drive_snapshot(device, name, &errp);
133 + hmp_handle_error(mon, &errp);
134 +}
135 +
136 +void hmp_savevm_end(Monitor *mon, const QDict *qdict)
137 +{
138 + Error *errp = NULL;
139 +
140 + qmp_savevm_end(&errp);
141 + hmp_handle_error(mon, &errp);
142 +}
143 +
144 +void hmp_info_savevm(Monitor *mon, const QDict *qdict)
145 +{
146 + SaveVMInfo *info;
147 + info = qmp_query_savevm(NULL);
148 +
149 + if (info->has_status) {
150 + monitor_printf(mon, "savevm status: %s\n", info->status);
151 + monitor_printf(mon, "total time: %" PRIu64 " milliseconds\n",
152 + info->total_time);
153 + } else {
154 + monitor_printf(mon, "savevm status: not running\n");
155 + }
156 + if (info->has_bytes) {
157 + monitor_printf(mon, "Bytes saved: %"PRIu64"\n", info->bytes);
158 + }
159 + if (info->has_error) {
160 + monitor_printf(mon, "Error: %s\n", info->error);
161 + }
162 +}
163
164 void hmp_qom_list(Monitor *mon, const QDict *qdict)
165 {
166 Index: new/hmp.h
167 ===================================================================
168 --- new.orig/hmp.h 2014-11-20 09:13:01.000000000 +0100
169 +++ new/hmp.h 2014-11-20 09:16:47.000000000 +0100
170 @@ -26,6 +26,7 @@
171 void hmp_info_uuid(Monitor *mon, const QDict *qdict);
172 void hmp_info_chardev(Monitor *mon, const QDict *qdict);
173 void hmp_info_mice(Monitor *mon, const QDict *qdict);
174 +void hmp_info_savevm(Monitor *mon, const QDict *qdict);
175 void hmp_info_migrate(Monitor *mon, const QDict *qdict);
176 void hmp_info_migrate_capabilities(Monitor *mon, const QDict *qdict);
177 void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict);
178 @@ -85,6 +86,10 @@
179 void hmp_netdev_del(Monitor *mon, const QDict *qdict);
180 void hmp_getfd(Monitor *mon, const QDict *qdict);
181 void hmp_closefd(Monitor *mon, const QDict *qdict);
182 +void hmp_savevm_start(Monitor *mon, const QDict *qdict);
183 +void hmp_snapshot_drive(Monitor *mon, const QDict *qdict);
184 +void hmp_delete_drive_snapshot(Monitor *mon, const QDict *qdict);
185 +void hmp_savevm_end(Monitor *mon, const QDict *qdict);
186 void hmp_sendkey(Monitor *mon, const QDict *qdict);
187 void hmp_screendump(Monitor *mon, const QDict *qdict);
188 void hmp_nbd_server_start(Monitor *mon, const QDict *qdict);
189 Index: new/include/block/block.h
190 ===================================================================
191 --- new.orig/include/block/block.h 2014-11-20 09:13:01.000000000 +0100
192 +++ new/include/block/block.h 2014-11-20 09:16:47.000000000 +0100
193 @@ -235,6 +235,7 @@
194 int bdrv_get_backing_file_depth(BlockDriverState *bs);
195 void bdrv_refresh_filename(BlockDriverState *bs);
196 int bdrv_truncate(BlockDriverState *bs, int64_t offset);
197 +void bdrv_delete(BlockDriverState *bs);
198 int64_t bdrv_nb_sectors(BlockDriverState *bs);
199 int64_t bdrv_getlength(BlockDriverState *bs);
200 int64_t bdrv_get_allocated_file_size(BlockDriverState *bs);
201 Index: new/include/sysemu/sysemu.h
202 ===================================================================
203 --- new.orig/include/sysemu/sysemu.h 2014-11-20 09:13:01.000000000 +0100
204 +++ new/include/sysemu/sysemu.h 2014-11-20 09:16:47.000000000 +0100
205 @@ -76,17 +76,18 @@
206
207 void hmp_savevm(Monitor *mon, const QDict *qdict);
208 int load_vmstate(const char *name);
209 +int load_state_from_blockdev(const char *filename);
210 void hmp_delvm(Monitor *mon, const QDict *qdict);
211 void hmp_info_snapshots(Monitor *mon, const QDict *qdict);
212
213 void qemu_announce_self(void);
214
215 bool qemu_savevm_state_blocked(Error **errp);
216 -void qemu_savevm_state_begin(QEMUFile *f,
217 +int qemu_savevm_state_begin(QEMUFile *f,
218 const MigrationParams *params);
219 void qemu_savevm_state_header(QEMUFile *f);
220 int qemu_savevm_state_iterate(QEMUFile *f);
221 -void qemu_savevm_state_complete(QEMUFile *f);
222 +int qemu_savevm_state_complete(QEMUFile *f);
223 void qemu_savevm_state_cancel(void);
224 uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size);
225 int qemu_loadvm_state(QEMUFile *f);
226 Index: new/monitor.c
227 ===================================================================
228 --- new.orig/monitor.c 2014-11-20 09:13:01.000000000 +0100
229 +++ new/monitor.c 2014-11-20 09:16:47.000000000 +0100
230 @@ -2876,6 +2876,13 @@
231 .mhandler.cmd = hmp_info_migrate_cache_size,
232 },
233 {
234 + .name = "savevm",
235 + .args_type = "",
236 + .params = "",
237 + .help = "show savevm status",
238 + .mhandler.cmd = hmp_info_savevm,
239 + },
240 + {
241 .name = "balloon",
242 .args_type = "",
243 .params = "",
244 Index: new/qapi-schema.json
245 ===================================================================
246 --- new.orig/qapi-schema.json 2014-11-20 09:13:01.000000000 +0100
247 +++ new/qapi-schema.json 2014-11-20 09:16:47.000000000 +0100
248 @@ -550,6 +550,42 @@
249 '*downtime': 'int',
250 '*setup-time': 'int'} }
251
252 +
253 +# @SaveVMInfo
254 +#
255 +# Information about current migration process.
256 +#
257 +# @status: #optional string describing the current savevm status.
258 +# This can be 'active', 'completed', 'failed'.
259 +# If this field is not returned, no savevm process
260 +# has been initiated
261 +#
262 +# @error: #optional string containing error message is status is failed.
263 +#
264 +# @total-time: #optional total amount of milliseconds since savevm started.
265 +# If savevm has ended, it returns the total save time
266 +#
267 +# @bytes: #optional total amount of data transfered
268 +#
269 +# Since: 1.3
270 +##
271 +{ 'struct': 'SaveVMInfo',
272 + 'data': {'*status': 'str', '*error': 'str',
273 + '*total-time': 'int', '*bytes': 'int'} }
274 +
275 +##
276 +# @query-savevm
277 +#
278 +# Returns information about current savevm process.
279 +#
280 +# Returns: @SaveVMInfo
281 +#
282 +# Since: 1.3
283 +##
284 +{ 'command': 'query-savevm', 'returns': 'SaveVMInfo' }
285 +
286 +##
287 +
288 ##
289 # @query-migrate
290 #
291 @@ -2649,8 +2685,18 @@
292 #
293 # Since: 1.2.0
294 ##
295 +
296 { 'command': 'query-target', 'returns': 'TargetInfo' }
297
298 +{ 'command': 'savevm-start', 'data': { '*statefile': 'str' } }
299 +
300 +{ 'command': 'snapshot-drive', 'data': { 'device': 'str', 'name': 'str' } }
301 +
302 +{ 'command': 'delete-drive-snapshot', 'data': { 'device': 'str', 'name': 'str' } }
303 +
304 +{ 'command': 'savevm-end' }
305 +
306 +
307 ##
308 # @QKeyCode:
309 #
310 Index: new/qemu-options.hx
311 ===================================================================
312 --- new.orig/qemu-options.hx 2014-11-20 09:13:01.000000000 +0100
313 +++ new/qemu-options.hx 2014-11-20 09:16:47.000000000 +0100
314 @@ -2975,6 +2975,19 @@
315 Start right away with a saved state (@code{loadvm} in monitor)
316 ETEXI
317
318 +DEF("loadstate", HAS_ARG, QEMU_OPTION_loadstate, \
319 + "-loadstate file\n" \
320 + " start right away with a saved state\n",
321 + QEMU_ARCH_ALL)
322 +STEXI
323 +@item -loadstate @var{file}
324 +@findex -loadstate
325 +Start right away with a saved state. This option does not rollback
326 +disk state like @code{loadvm}, so user must make sure that disk
327 +have correct state. @var{file} can be any valid device URL. See the section
328 +for "Device URL Syntax" for more information.
329 +ETEXI
330 +
331 #ifndef _WIN32
332 DEF("daemonize", 0, QEMU_OPTION_daemonize, \
333 "-daemonize daemonize QEMU after initializing\n", QEMU_ARCH_ALL)
334 Index: new/qmp-commands.hx
335 ===================================================================
336 --- new.orig/qmp-commands.hx 2014-11-20 09:13:01.000000000 +0100
337 +++ new/qmp-commands.hx 2014-11-20 09:16:47.000000000 +0100
338 @@ -4200,6 +4200,36 @@
339 <- { "return": {} }
340
341 EQMP
342 +
343 + {
344 + .name = "savevm-start",
345 + .args_type = "statefile:s?",
346 + .mhandler.cmd_new = qmp_marshal_input_savevm_start,
347 + },
348 +
349 + {
350 + .name = "snapshot-drive",
351 + .args_type = "device:s,name:s",
352 + .mhandler.cmd_new = qmp_marshal_input_snapshot_drive,
353 + },
354 +
355 + {
356 + .name = "delete-drive-snapshot",
357 + .args_type = "device:s,name:s",
358 + .mhandler.cmd_new = qmp_marshal_input_delete_drive_snapshot,
359 + },
360 +
361 + {
362 + .name = "savevm-end",
363 + .args_type = "",
364 + .mhandler.cmd_new = qmp_marshal_input_savevm_end,
365 + },
366 +
367 + {
368 + .name = "query-savevm",
369 + .args_type = "",
370 + .mhandler.cmd_new = qmp_marshal_input_query_savevm,
371 + },
372
373 {
374 .name = "query-rocker",
375 Index: new/savevm-async.c
376 ===================================================================
377 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
378 +++ new/savevm-async.c 2014-11-20 09:17:48.000000000 +0100
379 @@ -0,0 +1,506 @@
380 +#include "qemu-common.h"
381 +#include "qapi/qmp/qerror.h"
382 +#include "qemu/error-report.h"
383 +#include "sysemu/sysemu.h"
384 +#include "qmp-commands.h"
385 +#include "qemu-options.h"
386 +#include "migration/qemu-file.h"
387 +#include "qom/qom-qobject.h"
388 +#include "migration/migration.h"
389 +#include "block/snapshot.h"
390 +#include "block/qapi.h"
391 +#include "block/block.h"
392 +#include "qemu/timer.h"
393 +#include "sysemu/block-backend.h"
394 +
395 +/* #define DEBUG_SAVEVM_STATE */
396 +
397 +#ifdef DEBUG_SAVEVM_STATE
398 +#define DPRINTF(fmt, ...) \
399 + do { printf("savevm-async: " fmt, ## __VA_ARGS__); } while (0)
400 +#else
401 +#define DPRINTF(fmt, ...) \
402 + do { } while (0)
403 +#endif
404 +
405 +enum {
406 + SAVE_STATE_DONE,
407 + SAVE_STATE_ERROR,
408 + SAVE_STATE_ACTIVE,
409 + SAVE_STATE_COMPLETED,
410 + SAVE_STATE_CANCELLED
411 +};
412 +
413 +
414 +static struct SnapshotState {
415 + BlockDriverState *bs;
416 + size_t bs_pos;
417 + int state;
418 + Error *error;
419 + Error *blocker;
420 + int saved_vm_running;
421 + QEMUFile *file;
422 + int64_t total_time;
423 +} snap_state;
424 +
425 +SaveVMInfo *qmp_query_savevm(Error **errp)
426 +{
427 + SaveVMInfo *info = g_malloc0(sizeof(*info));
428 + struct SnapshotState *s = &snap_state;
429 +
430 + if (s->state != SAVE_STATE_DONE) {
431 + info->has_bytes = true;
432 + info->bytes = s->bs_pos;
433 + switch (s->state) {
434 + case SAVE_STATE_ERROR:
435 + info->has_status = true;
436 + info->status = g_strdup("failed");
437 + info->has_total_time = true;
438 + info->total_time = s->total_time;
439 + if (s->error) {
440 + info->has_error = true;
441 + info->error = g_strdup(error_get_pretty(s->error));
442 + }
443 + break;
444 + case SAVE_STATE_ACTIVE:
445 + info->has_status = true;
446 + info->status = g_strdup("active");
447 + info->has_total_time = true;
448 + info->total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME)
449 + - s->total_time;
450 + break;
451 + case SAVE_STATE_COMPLETED:
452 + info->has_status = true;
453 + info->status = g_strdup("completed");
454 + info->has_total_time = true;
455 + info->total_time = s->total_time;
456 + break;
457 + }
458 + }
459 +
460 + return info;
461 +}
462 +
463 +static int save_snapshot_cleanup(void)
464 +{
465 + int ret = 0;
466 +
467 + DPRINTF("save_snapshot_cleanup\n");
468 +
469 + snap_state.total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME) -
470 + snap_state.total_time;
471 +
472 + if (snap_state.file) {
473 + ret = qemu_fclose(snap_state.file);
474 + }
475 +
476 + if (snap_state.bs) {
477 + /* try to truncate, but ignore errors (will fail on block devices).
478 + * note: bdrv_read() need whole blocks, so we round up
479 + */
480 + size_t size = (snap_state.bs_pos + BDRV_SECTOR_SIZE) & BDRV_SECTOR_MASK;
481 + bdrv_truncate(snap_state.bs, size);
482 + bdrv_op_unblock_all(snap_state.bs, snap_state.blocker);
483 + error_free(snap_state.blocker);
484 + snap_state.blocker = NULL;
485 + bdrv_unref(snap_state.bs);
486 + snap_state.bs = NULL;
487 + }
488 +
489 + return ret;
490 +}
491 +
492 +static void save_snapshot_error(const char *fmt, ...)
493 +{
494 + va_list ap;
495 + char *msg;
496 +
497 + va_start(ap, fmt);
498 + msg = g_strdup_vprintf(fmt, ap);
499 + va_end(ap);
500 +
501 + DPRINTF("save_snapshot_error: %s\n", msg);
502 +
503 + if (!snap_state.error) {
504 + error_set(&snap_state.error, ERROR_CLASS_GENERIC_ERROR, "%s", msg);
505 + }
506 +
507 + g_free (msg);
508 +
509 + snap_state.state = SAVE_STATE_ERROR;
510 +
511 + save_snapshot_cleanup();
512 +}
513 +
514 +static void save_snapshot_completed(void)
515 +{
516 + DPRINTF("save_snapshot_completed\n");
517 +
518 + if (save_snapshot_cleanup() < 0) {
519 + snap_state.state = SAVE_STATE_ERROR;
520 + } else {
521 + snap_state.state = SAVE_STATE_COMPLETED;
522 + }
523 +}
524 +
525 +static int block_state_close(void *opaque)
526 +{
527 + snap_state.file = NULL;
528 + return bdrv_flush(snap_state.bs);
529 +}
530 +
531 +static int block_state_put_buffer(void *opaque, const uint8_t *buf,
532 + int64_t pos, int size)
533 +{
534 + int ret;
535 +
536 + assert(pos == snap_state.bs_pos);
537 +
538 + if ((ret = bdrv_pwrite(snap_state.bs, snap_state.bs_pos, buf, size)) > 0) {
539 + snap_state.bs_pos += ret;
540 + }
541 +
542 + return ret;
543 +}
544 +
545 +static void process_savevm_co(void *opaque)
546 +{
547 + int ret;
548 + int64_t maxlen;
549 + MigrationParams params = {
550 + .blk = 0,
551 + .shared = 0
552 + };
553 +
554 + snap_state.state = SAVE_STATE_ACTIVE;
555 +
556 + qemu_mutex_unlock_iothread();
557 + ret = qemu_savevm_state_begin(snap_state.file, &params);
558 + qemu_mutex_lock_iothread();
559 +
560 + if (ret < 0) {
561 + save_snapshot_error("qemu_savevm_state_begin failed");
562 + return;
563 + }
564 +
565 + while (snap_state.state == SAVE_STATE_ACTIVE) {
566 + uint64_t pending_size;
567 +
568 + pending_size = qemu_savevm_state_pending(snap_state.file, 0);
569 +
570 + if (pending_size) {
571 + ret = qemu_savevm_state_iterate(snap_state.file);
572 + if (ret < 0) {
573 + save_snapshot_error("qemu_savevm_state_iterate error %d", ret);
574 + break;
575 + }
576 + DPRINTF("savevm inerate pending size %lu ret %d\n", pending_size, ret);
577 + } else {
578 + DPRINTF("done iterating\n");
579 + if (runstate_is_running()) {
580 + vm_stop(RUN_STATE_SAVE_VM);
581 + }
582 + DPRINTF("savevm inerate finished\n");
583 + qemu_savevm_state_complete(snap_state.file);
584 + DPRINTF("save complete\n");
585 + save_snapshot_completed();
586 + break;
587 + }
588 +
589 + /* stop the VM if we get to the end of available space,
590 + * or if pending_size is just a few MB
591 + */
592 + maxlen = bdrv_getlength(snap_state.bs) - 30*1024*1024;
593 + if ((pending_size < 100000) ||
594 + ((snap_state.bs_pos + pending_size) >= maxlen)) {
595 + if (runstate_is_running()) {
596 + vm_stop(RUN_STATE_SAVE_VM);
597 + }
598 + }
599 + }
600 +
601 + if(snap_state.state == SAVE_STATE_CANCELLED) {
602 + save_snapshot_completed();
603 + Error *errp = NULL;
604 + qmp_savevm_end(&errp);
605 + }
606 +
607 +}
608 +
609 +static const QEMUFileOps block_file_ops = {
610 + .put_buffer = block_state_put_buffer,
611 + .close = block_state_close,
612 +};
613 +
614 +
615 +void qmp_savevm_start(bool has_statefile, const char *statefile, Error **errp)
616 +{
617 + BlockDriver *drv = NULL;
618 + Error *local_err = NULL;
619 +
620 + int bdrv_oflags = BDRV_O_CACHE_WB | BDRV_O_RDWR;
621 + int ret;
622 +
623 + if (snap_state.state != SAVE_STATE_DONE) {
624 + error_set(errp, ERROR_CLASS_GENERIC_ERROR,
625 + "VM snapshot already started\n");
626 + return;
627 + }
628 +
629 + /* initialize snapshot info */
630 + snap_state.saved_vm_running = runstate_is_running();
631 + snap_state.bs_pos = 0;
632 + snap_state.total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
633 + snap_state.blocker = NULL;
634 +
635 + if (snap_state.error) {
636 + error_free(snap_state.error);
637 + snap_state.error = NULL;
638 + }
639 +
640 + if (!has_statefile) {
641 + vm_stop(RUN_STATE_SAVE_VM);
642 + snap_state.state = SAVE_STATE_COMPLETED;
643 + return;
644 + }
645 +
646 + if (qemu_savevm_state_blocked(errp)) {
647 + return;
648 + }
649 +
650 + /* Open the image */
651 + snap_state.bs = bdrv_new();
652 +
653 + ret = bdrv_open(&snap_state.bs, statefile, NULL, NULL, bdrv_oflags, drv, &local_err);
654 + if (ret < 0) {
655 + error_set(errp, ERROR_CLASS_GENERIC_ERROR, "failed to open '%s'", statefile);
656 + goto restart;
657 + }
658 +
659 + snap_state.file = qemu_fopen_ops(&snap_state, &block_file_ops);
660 +
661 + if (!snap_state.file) {
662 + error_set(errp, ERROR_CLASS_GENERIC_ERROR, "failed to open '%s'", statefile);
663 + goto restart;
664 + }
665 +
666 +
667 + error_setg(&snap_state.blocker, "block device is in use by savevm");
668 + bdrv_op_block_all(snap_state.bs, snap_state.blocker);
669 +
670 + Coroutine *co = qemu_coroutine_create(process_savevm_co);
671 + qemu_coroutine_enter(co, NULL);
672 +
673 + return;
674 +
675 +restart:
676 +
677 + save_snapshot_error("setup failed");
678 +
679 + if (snap_state.saved_vm_running) {
680 + vm_start();
681 + }
682 +}
683 +
684 +void qmp_savevm_end(Error **errp)
685 +{
686 + if (snap_state.state == SAVE_STATE_DONE) {
687 + error_set(errp, ERROR_CLASS_GENERIC_ERROR,
688 + "VM snapshot not started\n");
689 + return;
690 + }
691 +
692 + if (snap_state.state == SAVE_STATE_ACTIVE) {
693 + snap_state.state = SAVE_STATE_CANCELLED;
694 + return;
695 + }
696 +
697 + if (snap_state.saved_vm_running) {
698 + vm_start();
699 + }
700 +
701 + snap_state.state = SAVE_STATE_DONE;
702 +}
703 +
704 +void qmp_snapshot_drive(const char *device, const char *name, Error **errp)
705 +{
706 + BlockBackend *blk;
707 + BlockDriverState *bs;
708 + QEMUSnapshotInfo sn1, *sn = &sn1;
709 + int ret;
710 +#ifdef _WIN32
711 + struct _timeb tb;
712 +#else
713 + struct timeval tv;
714 +#endif
715 +
716 + if (snap_state.state != SAVE_STATE_COMPLETED) {
717 + error_set(errp, ERROR_CLASS_GENERIC_ERROR,
718 + "VM snapshot not ready/started\n");
719 + return;
720 + }
721 +
722 + blk = blk_by_name(device);
723 + if (!blk) {
724 + error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
725 + "Device '%s' not found", device);
726 + return;
727 + }
728 +
729 + bs = blk_bs(blk);
730 + if (!bdrv_is_inserted(bs)) {
731 + error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, device);
732 + return;
733 + }
734 +
735 + if (bdrv_is_read_only(bs)) {
736 + error_setg(errp, "Node '%s' is read only", device);
737 + return;
738 + }
739 +
740 + if (!bdrv_can_snapshot(bs)) {
741 + error_setg(errp, QERR_UNSUPPORTED);
742 + return;
743 + }
744 +
745 + if (bdrv_snapshot_find(bs, sn, name) >= 0) {
746 + error_set(errp, ERROR_CLASS_GENERIC_ERROR,
747 + "snapshot '%s' already exists", name);
748 + return;
749 + }
750 +
751 + sn = &sn1;
752 + memset(sn, 0, sizeof(*sn));
753 +
754 +#ifdef _WIN32
755 + _ftime(&tb);
756 + sn->date_sec = tb.time;
757 + sn->date_nsec = tb.millitm * 1000000;
758 +#else
759 + gettimeofday(&tv, NULL);
760 + sn->date_sec = tv.tv_sec;
761 + sn->date_nsec = tv.tv_usec * 1000;
762 +#endif
763 + sn->vm_clock_nsec = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
764 +
765 + pstrcpy(sn->name, sizeof(sn->name), name);
766 +
767 + sn->vm_state_size = 0; /* do not save state */
768 +
769 + ret = bdrv_snapshot_create(bs, sn);
770 + if (ret < 0) {
771 + error_set(errp, ERROR_CLASS_GENERIC_ERROR,
772 + "Error while creating snapshot on '%s'\n", device);
773 + return;
774 + }
775 +}
776 +
777 +void qmp_delete_drive_snapshot(const char *device, const char *name,
778 + Error **errp)
779 +{
780 + BlockBackend *blk;
781 + BlockDriverState *bs;
782 + QEMUSnapshotInfo sn1, *sn = &sn1;
783 + Error *local_err = NULL;
784 +
785 + int ret;
786 +
787 + blk = blk_by_name(device);
788 + if (!blk) {
789 + error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
790 + "Device '%s' not found", device);
791 + return;
792 + }
793 +
794 + bs = blk_bs(blk);
795 + if (bdrv_is_read_only(bs)) {
796 + error_setg(errp, "Node '%s' is read only", device);
797 + return;
798 + }
799 +
800 + if (!bdrv_can_snapshot(bs)) {
801 + error_setg(errp, QERR_UNSUPPORTED);
802 + return;
803 + }
804 +
805 + if (bdrv_snapshot_find(bs, sn, name) < 0) {
806 + /* return success if snapshot does not exists */
807 + return;
808 + }
809 +
810 + ret = bdrv_snapshot_delete(bs, NULL, name, &local_err);
811 + if (ret < 0) {
812 + error_set(errp, ERROR_CLASS_GENERIC_ERROR,
813 + "Error while deleting snapshot on '%s'\n", device);
814 + return;
815 + }
816 +}
817 +
818 +static int loadstate_get_buffer(void *opaque, uint8_t *buf, int64_t pos,
819 + int size)
820 +{
821 + BlockDriverState *bs = (BlockDriverState *)opaque;
822 + int64_t maxlen = bdrv_getlength(bs);
823 + if (pos > maxlen) {
824 + return -EIO;
825 + }
826 + if ((pos + size) > maxlen) {
827 + size = maxlen - pos - 1;
828 + }
829 + if (size == 0) {
830 + return 0;
831 + }
832 + return bdrv_pread(bs, pos, buf, size);
833 +}
834 +
835 +static const QEMUFileOps loadstate_file_ops = {
836 + .get_buffer = loadstate_get_buffer,
837 +};
838 +
839 +int load_state_from_blockdev(const char *filename)
840 +{
841 + BlockDriverState *bs = NULL;
842 + BlockDriver *drv = NULL;
843 + Error *local_err = NULL;
844 + Error *blocker = NULL;
845 +
846 + QEMUFile *f;
847 + int ret = -1;
848 +
849 + bs = bdrv_new();
850 + ret = bdrv_open(&bs, filename, NULL, NULL, BDRV_O_CACHE_WB, drv, &local_err);
851 + error_setg(&blocker, "block device is in use by load state");
852 + bdrv_op_block_all(bs, blocker);
853 +
854 + if (ret < 0) {
855 + error_report("Could not open VM state file");
856 + goto the_end;
857 + }
858 +
859 + /* restore the VM state */
860 + f = qemu_fopen_ops(bs, &loadstate_file_ops);
861 + if (!f) {
862 + error_report("Could not open VM state file");
863 + ret = -EINVAL;
864 + goto the_end;
865 + }
866 +
867 + qemu_system_reset(VMRESET_SILENT);
868 + ret = qemu_loadvm_state(f);
869 +
870 + qemu_fclose(f);
871 + if (ret < 0) {
872 + error_report("Error %d while loading VM state", ret);
873 + goto the_end;
874 + }
875 +
876 + ret = 0;
877 +
878 + the_end:
879 + if (bs) {
880 + bdrv_op_unblock_all(bs, blocker);
881 + error_free(blocker);
882 + bdrv_unref(bs);
883 + }
884 + return ret;
885 +}
886 Index: new/savevm.c
887 ===================================================================
888 --- new.orig/migration/savevm.c 2014-11-20 09:13:01.000000000 +0100
889 +++ new/migration/savevm.c 2014-11-20 09:16:47.000000000 +0100
890 @@ -718,11 +718,11 @@
891 qemu_put_be32(f, QEMU_VM_FILE_VERSION);
892 }
893
894 -void qemu_savevm_state_begin(QEMUFile *f,
895 +int qemu_savevm_state_begin(QEMUFile *f,
896 const MigrationParams *params)
897 {
898 SaveStateEntry *se;
899 - int ret;
900 + int ret = 0;
901
902 trace_savevm_state_begin();
903 QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {
904 @@ -642,6 +642,7 @@
905 break;
906 }
907 }
908 + return ret;
909 }
910
911 /*
912 @@ -690,7 +691,7 @@
913 return !machine->suppress_vmdesc;
914 }
915
916 -void qemu_savevm_state_complete(QEMUFile *f)
917 +int qemu_savevm_state_complete(QEMUFile *f)
918 {
919 QJSON *vmdesc;
920 int vmdesc_len;
921 @@ -838,7 +839,7 @@
922 save_section_footer(f, se);
923 if (ret < 0) {
924 qemu_file_set_error(f, ret);
925 - return;
926 + return ret;
927 }
928 }
929
930 @@ -746,6 +747,7 @@
931 object_unref(OBJECT(vmdesc));
932
933 qemu_fflush(f);
934 + return qemu_file_get_error(f);
935 }
936
937 uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size)
938 Index: new/vl.c
939 ===================================================================
940 --- new.orig/vl.c 2014-11-20 09:13:01.000000000 +0100
941 +++ new/vl.c 2014-11-20 09:16:47.000000000 +0100
942 @@ -2760,6 +2760,7 @@
943 int optind;
944 const char *optarg;
945 const char *loadvm = NULL;
946 + const char *loadstate = NULL;
947 MachineClass *machine_class;
948 const char *cpu_model;
949 const char *vga_model = NULL;
950 @@ -3457,6 +3458,9 @@
951 case QEMU_OPTION_loadvm:
952 loadvm = optarg;
953 break;
954 + case QEMU_OPTION_loadstate:
955 + loadstate = optarg;
956 + break;
957 case QEMU_OPTION_full_screen:
958 full_screen = 1;
959 break;
960 @@ -4428,6 +4432,10 @@
961 if (load_vmstate(loadvm) < 0) {
962 autostart = 0;
963 }
964 + } else if (loadstate) {
965 + if (load_state_from_blockdev(loadstate) < 0) {
966 + autostart = 0;
967 + }
968 }
969
970 qdev_prop_check_globals();
old QEMU for PVE