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