| blob | 32f06830be39dc5d6d0c5aa1f53aed91ce500254 |
1 From 30e5d63f13a3f7adcd1f473fa0238c3e2e915114 Mon Sep 17 00:00:00 2001
2 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
3 Date: Wed, 9 Dec 2015 15:20:56 +0100
4 Subject: [PATCH 16/55] backup: add pve monitor commands
6 ---
7 blockdev.c | 438 +++++++++++++++++++++++++++++++++++++++++++++++++++
8 hmp-commands-info.hx | 13 ++
9 hmp-commands.hx | 29 ++++
10 hmp.c | 61 +++++++
11 hmp.h | 3 +
12 qapi-schema.json | 89 +++++++++++
13 qmp-commands.hx | 18 +++
14 7 files changed, 651 insertions(+)
16 diff --git a/blockdev.c b/blockdev.c
17 index dfc5204..115524f 100644
18 --- a/blockdev.c
19 +++ b/blockdev.c
20 @@ -52,6 +52,7 @@
21 #include "sysemu/arch_init.h"
22 #include "qemu/cutils.h"
23 #include "qemu/help_option.h"
24 +#include "vma.h"
26 static QTAILQ_HEAD(, BlockDriverState) monitor_bdrv_states =
27 QTAILQ_HEAD_INITIALIZER(monitor_bdrv_states);
28 @@ -2989,6 +2990,443 @@ static void block_job_cb(void *opaque, int ret)
29 }
30 }
32 +/* PVE backup related function */
33 +
34 +static struct PVEBackupState {
35 + Error *error;
36 + bool cancel;
37 + uuid_t uuid;
38 + char uuid_str[37];
39 + int64_t speed;
40 + time_t start_time;
41 + time_t end_time;
42 + char *backup_file;
43 + VmaWriter *vmaw;
44 + GList *di_list;
45 + size_t total;
46 + size_t transferred;
47 + size_t zero_bytes;
48 +} backup_state;
49 +
50 +typedef struct PVEBackupDevInfo {
51 + BlockDriverState *bs;
52 + size_t size;
53 + uint8_t dev_id;
54 + //bool started;
55 + bool completed;
56 +} PVEBackupDevInfo;
57 +
58 +static void pvebackup_run_next_job(void);
59 +
60 +static int pvebackup_dump_cb(void *opaque, BlockDriverState *target,
61 + int64_t sector_num, int n_sectors,
62 + unsigned char *buf)
63 +{
64 + PVEBackupDevInfo *di = opaque;
65 +
66 + if (sector_num & 0x7f) {
67 + if (!backup_state.error) {
68 + error_setg(&backup_state.error,
69 + "got unaligned write inside backup dump "
70 + "callback (sector %ld)", sector_num);
71 + }
72 + return -1; // not aligned to cluster size
73 + }
74 +
75 + int64_t cluster_num = sector_num >> 7;
76 + int size = n_sectors * BDRV_SECTOR_SIZE;
77 +
78 + int ret = -1;
79 +
80 + if (backup_state.vmaw) {
81 + size_t zero_bytes = 0;
82 + ret = vma_writer_write(backup_state.vmaw, di->dev_id, cluster_num,
83 + buf, &zero_bytes);
84 + backup_state.zero_bytes += zero_bytes;
85 + } else {
86 + ret = size;
87 + if (!buf) {
88 + backup_state.zero_bytes += size;
89 + }
90 + }
91 +
92 + backup_state.transferred += size;
93 +
94 + return ret;
95 +}
96 +
97 +static void pvebackup_cleanup(void)
98 +{
99 + backup_state.end_time = time(NULL);
100 +
101 + if (backup_state.vmaw) {
102 + Error *local_err = NULL;
103 + vma_writer_close(backup_state.vmaw, &local_err);
104 + error_propagate(&backup_state.error, local_err);
105 + backup_state.vmaw = NULL;
106 + }
107 +
108 + if (backup_state.di_list) {
109 + GList *l = backup_state.di_list;
110 + while (l) {
111 + PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
112 + l = g_list_next(l);
113 + g_free(di);
114 + }
115 + g_list_free(backup_state.di_list);
116 + backup_state.di_list = NULL;
117 + }
118 +}
119 +
120 +static void pvebackup_complete_cb(void *opaque, int ret)
121 +{
122 + PVEBackupDevInfo *di = opaque;
123 +
124 + assert(backup_state.vmaw);
125 +
126 + di->completed = true;
127 +
128 + if (ret < 0 && !backup_state.error) {
129 + error_setg(&backup_state.error, "job failed with err %d - %s",
130 + ret, strerror(-ret));
131 + }
132 +
133 + BlockDriverState *bs = di->bs;
134 +
135 + di->bs = NULL;
136 +
137 + vma_writer_close_stream(backup_state.vmaw, di->dev_id);
138 +
139 + block_job_cb(bs, ret);
140 +
141 + if (!backup_state.cancel) {
142 + pvebackup_run_next_job();
143 + }
144 +}
145 +
146 +static void pvebackup_cancel(void *opaque)
147 +{
148 + backup_state.cancel = true;
149 +
150 + if (!backup_state.error) {
151 + error_setg(&backup_state.error, "backup cancelled");
152 + }
153 +
154 + /* drain all i/o (awake jobs waiting for aio) */
155 + bdrv_drain_all();
156 +
157 + GList *l = backup_state.di_list;
158 + while (l) {
159 + PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
160 + l = g_list_next(l);
161 + if (!di->completed && di->bs) {
162 + BlockJob *job = di->bs->job;
163 + if (job) {
164 + if (!di->completed) {
165 + block_job_cancel_sync(job);
166 + }
167 + }
168 + }
169 + }
170 +
171 + pvebackup_cleanup();
172 +}
173 +
174 +void qmp_backup_cancel(Error **errp)
175 +{
176 + Coroutine *co = qemu_coroutine_create(pvebackup_cancel);
177 + qemu_coroutine_enter(co, NULL);
178 +
179 + while (backup_state.vmaw) {
180 + /* vma writer use main aio context */
181 + aio_poll(qemu_get_aio_context(), true);
182 + }
183 +}
184 +
185 +static void pvebackup_run_next_job(void)
186 +{
187 + GList *l = backup_state.di_list;
188 + while (l) {
189 + PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
190 + l = g_list_next(l);
191 + if (!di->completed && di->bs && di->bs->job) {
192 + BlockJob *job = di->bs->job;
193 + if (block_job_is_paused(job)) {
194 + bool cancel = backup_state.error || backup_state.cancel;
195 + if (cancel) {
196 + block_job_cancel(job);
197 + } else {
198 + block_job_resume(job);
199 + }
200 + }
201 + return;
202 + }
203 + }
204 +
205 + pvebackup_cleanup();
206 +}
207 +
208 +UuidInfo *qmp_backup(const char *backup_file, bool has_format,
209 + BackupFormat format,
210 + bool has_config_file, const char *config_file,
211 + bool has_devlist, const char *devlist,
212 + bool has_speed, int64_t speed, Error **errp)
213 +{
214 + BlockBackend *blk;
215 + BlockDriverState *bs = NULL;
216 + Error *local_err = NULL;
217 + uuid_t uuid;
218 + VmaWriter *vmaw = NULL;
219 + gchar **devs = NULL;
220 + GList *di_list = NULL;
221 + GList *l;
222 + UuidInfo *uuid_info;
223 +
224 + if (backup_state.di_list) {
225 + error_set(errp, ERROR_CLASS_GENERIC_ERROR,
226 + "previous backup not finished");
227 + return NULL;
228 + }
229 +
230 + /* Todo: try to auto-detect format based on file name */
231 + format = has_format ? format : BACKUP_FORMAT_VMA;
232 +
233 + if (format != BACKUP_FORMAT_VMA) {
234 + error_set(errp, ERROR_CLASS_GENERIC_ERROR, "unknown backup format");
235 + return NULL;
236 + }
237 +
238 + if (has_devlist) {
239 + devs = g_strsplit_set(devlist, ",;:", -1);
240 +
241 + gchar **d = devs;
242 + while (d && *d) {
243 + blk = blk_by_name(*d);
244 + if (blk) {
245 + bs = blk_bs(blk);
246 + if (bdrv_is_read_only(bs)) {
247 + error_setg(errp, "Node '%s' is read only", *d);
248 + goto err;
249 + }
250 + if (!bdrv_is_inserted(bs)) {
251 + error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, *d);
252 + goto err;
253 + }
254 + PVEBackupDevInfo *di = g_new0(PVEBackupDevInfo, 1);
255 + di->bs = bs;
256 + di_list = g_list_append(di_list, di);
257 + } else {
258 + error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
259 + "Device '%s' not found", *d);
260 + goto err;
261 + }
262 + d++;
263 + }
264 +
265 + } else {
266 +
267 + bs = NULL;
268 + while ((bs = bdrv_next(bs))) {
269 +
270 + if (!bdrv_is_inserted(bs) || bdrv_is_read_only(bs)) {
271 + continue;
272 + }
273 +
274 + PVEBackupDevInfo *di = g_new0(PVEBackupDevInfo, 1);
275 + di->bs = bs;
276 + di_list = g_list_append(di_list, di);
277 + }
278 + }
279 +
280 + if (!di_list) {
281 + error_set(errp, ERROR_CLASS_GENERIC_ERROR, "empty device list");
282 + goto err;
283 + }
284 +
285 + size_t total = 0;
286 +
287 + l = di_list;
288 + while (l) {
289 + PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
290 + l = g_list_next(l);
291 + if (bdrv_op_is_blocked(di->bs, BLOCK_OP_TYPE_BACKUP_SOURCE, errp)) {
292 + goto err;
293 + }
294 +
295 + ssize_t size = bdrv_getlength(di->bs);
296 + if (size < 0) {
297 + error_setg_errno(errp, -di->size, "bdrv_getlength failed");
298 + goto err;
299 + }
300 + di->size = size;
301 + total += size;
302 + }
303 +
304 + uuid_generate(uuid);
305 +
306 + vmaw = vma_writer_create(backup_file, uuid, &local_err);
307 + if (!vmaw) {
308 + if (local_err) {
309 + error_propagate(errp, local_err);
310 + }
311 + goto err;
312 + }
313 +
314 + /* register all devices for vma writer */
315 + l = di_list;
316 + while (l) {
317 + PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
318 + l = g_list_next(l);
319 +
320 + const char *devname = bdrv_get_device_name(di->bs);
321 + di->dev_id = vma_writer_register_stream(vmaw, devname, di->size);
322 + if (di->dev_id <= 0) {
323 + error_set(errp, ERROR_CLASS_GENERIC_ERROR,
324 + "register_stream failed");
325 + goto err;
326 + }
327 + }
328 +
329 + /* add configuration file to archive */
330 + if (has_config_file) {
331 + char *cdata = NULL;
332 + gsize clen = 0;
333 + GError *err = NULL;
334 + if (!g_file_get_contents(config_file, &cdata, &clen, &err)) {
335 + error_setg(errp, "unable to read file '%s'", config_file);
336 + goto err;
337 + }
338 +
339 + const char *basename = g_path_get_basename(config_file);
340 + if (vma_writer_add_config(vmaw, basename, cdata, clen) != 0) {
341 + error_setg(errp, "unable to add config data to vma archive");
342 + g_free(cdata);
343 + goto err;
344 + }
345 + g_free(cdata);
346 + }
347 +
348 + /* initialize global backup_state now */
349 +
350 + backup_state.cancel = false;
351 +
352 + if (backup_state.error) {
353 + error_free(backup_state.error);
354 + backup_state.error = NULL;
355 + }
356 +
357 + backup_state.speed = (has_speed && speed > 0) ? speed : 0;
358 +
359 + backup_state.start_time = time(NULL);
360 + backup_state.end_time = 0;
361 +
362 + if (backup_state.backup_file) {
363 + g_free(backup_state.backup_file);
364 + }
365 + backup_state.backup_file = g_strdup(backup_file);
366 +
367 + backup_state.vmaw = vmaw;
368 +
369 + uuid_copy(backup_state.uuid, uuid);
370 + uuid_unparse_lower(uuid, backup_state.uuid_str);
371 +
372 + backup_state.di_list = di_list;
373 +
374 + backup_state.total = total;
375 + backup_state.transferred = 0;
376 + backup_state.zero_bytes = 0;
377 +
378 + /* start all jobs (paused state) */
379 + l = di_list;
380 + while (l) {
381 + PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
382 + l = g_list_next(l);
383 +
384 + backup_start(di->bs, NULL, speed, MIRROR_SYNC_MODE_FULL, NULL,
385 + BLOCKDEV_ON_ERROR_REPORT, BLOCKDEV_ON_ERROR_REPORT,
386 + pvebackup_dump_cb, pvebackup_complete_cb, di,
387 + 1, &local_err);
388 + if (local_err != NULL) {
389 + error_setg(&backup_state.error, "backup_job_create failed");
390 + pvebackup_cancel(NULL);
391 + }
392 + }
393 +
394 + if (!backup_state.error) {
395 + pvebackup_run_next_job(); // run one job
396 + }
397 +
398 + uuid_info = g_malloc0(sizeof(*uuid_info));
399 + uuid_info->UUID = g_strdup(backup_state.uuid_str);
400 + return uuid_info;
401 +
402 +err:
403 +
404 + l = di_list;
405 + while (l) {
406 + g_free(l->data);
407 + l = g_list_next(l);
408 + }
409 + g_list_free(di_list);
410 +
411 + if (devs) {
412 + g_strfreev(devs);
413 + }
414 +
415 + if (vmaw) {
416 + Error *err = NULL;
417 + vma_writer_close(vmaw, &err);
418 + unlink(backup_file);
419 + }
420 +
421 + return NULL;
422 +}
423 +
424 +BackupStatus *qmp_query_backup(Error **errp)
425 +{
426 + BackupStatus *info = g_malloc0(sizeof(*info));
427 +
428 + if (!backup_state.start_time) {
429 + /* not started, return {} */
430 + return info;
431 + }
432 +
433 + info->has_status = true;
434 + info->has_start_time = true;
435 + info->start_time = backup_state.start_time;
436 +
437 + if (backup_state.backup_file) {
438 + info->has_backup_file = true;
439 + info->backup_file = g_strdup(backup_state.backup_file);
440 + }
441 +
442 + info->has_uuid = true;
443 + info->uuid = g_strdup(backup_state.uuid_str);
444 +
445 + if (backup_state.end_time) {
446 + if (backup_state.error) {
447 + info->status = g_strdup("error");
448 + info->has_errmsg = true;
449 + info->errmsg = g_strdup(error_get_pretty(backup_state.error));
450 + } else {
451 + info->status = g_strdup("done");
452 + }
453 + info->has_end_time = true;
454 + info->end_time = backup_state.end_time;
455 + } else {
456 + info->status = g_strdup("active");
457 + }
458 +
459 + info->has_total = true;
460 + info->total = backup_state.total;
461 + info->has_zero_bytes = true;
462 + info->zero_bytes = backup_state.zero_bytes;
463 + info->has_transferred = true;
464 + info->transferred = backup_state.transferred;
465 +
466 + return info;
467 +}
468 +
469 void qmp_block_stream(const char *device,
470 bool has_base, const char *base,
471 bool has_backing_file, const char *backing_file,
472 diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx
473 index 52539c3..f872262 100644
474 --- a/hmp-commands-info.hx
475 +++ b/hmp-commands-info.hx
476 @@ -502,6 +502,19 @@ STEXI
477 Show CPU statistics.
478 ETEXI
480 + {
481 + .name = "backup",
482 + .args_type = "",
483 + .params = "",
484 + .help = "show backup status",
485 + .mhandler.cmd = hmp_info_backup,
486 + },
487 +
488 +STEXI
489 +@item info backup
490 +show backup status
491 +ETEXI
492 +
493 #if defined(CONFIG_SLIRP)
494 {
495 .name = "usernet",
496 diff --git a/hmp-commands.hx b/hmp-commands.hx
497 index 4f4f60a..63c44f5 100644
498 --- a/hmp-commands.hx
499 +++ b/hmp-commands.hx
500 @@ -87,6 +87,35 @@ STEXI
501 Copy data from a backing file into a block device.
502 ETEXI
504 + {
505 + .name = "backup",
506 + .args_type = "backupfile:s,speed:o?,devlist:s?",
507 + .params = "backupfile [speed [devlist]]",
508 + .help = "create a VM Backup.",
509 + .mhandler.cmd = hmp_backup,
510 + },
511 +
512 +STEXI
513 +@item backup
514 +@findex backup
515 +Create a VM backup.
516 +ETEXI
517 +
518 + {
519 + .name = "backup_cancel",
520 + .args_type = "",
521 + .params = "",
522 + .help = "cancel the current VM backup",
523 + .mhandler.cmd = hmp_backup_cancel,
524 + },
525 +
526 +STEXI
527 +@item backup_cancel
528 +@findex backup_cancel
529 +Cancel the current VM backup.
530 +
531 +ETEXI
532 +
533 {
534 .name = "block_job_set_speed",
535 .args_type = "device:B,speed:o",
536 diff --git a/hmp.c b/hmp.c
537 index fe80757..2d4bf97 100644
538 --- a/hmp.c
539 +++ b/hmp.c
540 @@ -148,6 +148,44 @@ void hmp_info_mice(Monitor *mon, const QDict *qdict)
541 qapi_free_MouseInfoList(mice_list);
542 }
544 +void hmp_info_backup(Monitor *mon, const QDict *qdict)
545 +{
546 + BackupStatus *info;
547 +
548 + info = qmp_query_backup(NULL);
549 + if (info->has_status) {
550 + if (info->has_errmsg) {
551 + monitor_printf(mon, "Backup status: %s - %s\n",
552 + info->status, info->errmsg);
553 + } else {
554 + monitor_printf(mon, "Backup status: %s\n", info->status);
555 + }
556 + }
557 +
558 + if (info->has_backup_file) {
559 + monitor_printf(mon, "Start time: %s", ctime(&info->start_time));
560 + if (info->end_time) {
561 + monitor_printf(mon, "End time: %s", ctime(&info->end_time));
562 + }
563 +
564 + int per = (info->has_total && info->total &&
565 + info->has_transferred && info->transferred) ?
566 + (info->transferred * 100)/info->total : 0;
567 + int zero_per = (info->has_total && info->total &&
568 + info->has_zero_bytes && info->zero_bytes) ?
569 + (info->zero_bytes * 100)/info->total : 0;
570 + monitor_printf(mon, "Backup file: %s\n", info->backup_file);
571 + monitor_printf(mon, "Backup uuid: %s\n", info->uuid);
572 + monitor_printf(mon, "Total size: %zd\n", info->total);
573 + monitor_printf(mon, "Transferred bytes: %zd (%d%%)\n",
574 + info->transferred, per);
575 + monitor_printf(mon, "Zero bytes: %zd (%d%%)\n",
576 + info->zero_bytes, zero_per);
577 + }
578 +
579 + qapi_free_BackupStatus(info);
580 +}
581 +
582 void hmp_info_migrate(Monitor *mon, const QDict *qdict)
583 {
584 MigrationInfo *info;
585 @@ -1476,6 +1514,29 @@ void hmp_block_stream(Monitor *mon, const QDict *qdict)
586 hmp_handle_error(mon, &error);
587 }
589 +void hmp_backup_cancel(Monitor *mon, const QDict *qdict)
590 +{
591 + Error *error = NULL;
592 +
593 + qmp_backup_cancel(&error);
594 +
595 + hmp_handle_error(mon, &error);
596 +}
597 +
598 +void hmp_backup(Monitor *mon, const QDict *qdict)
599 +{
600 + Error *error = NULL;
601 +
602 + const char *backup_file = qdict_get_str(qdict, "backupfile");
603 + const char *devlist = qdict_get_try_str(qdict, "devlist");
604 + int64_t speed = qdict_get_try_int(qdict, "speed", 0);
605 +
606 + qmp_backup(backup_file, true, BACKUP_FORMAT_VMA, false, NULL, !!devlist,
607 + devlist, qdict_haskey(qdict, "speed"), speed, &error);
608 +
609 + hmp_handle_error(mon, &error);
610 +}
611 +
612 void hmp_block_job_set_speed(Monitor *mon, const QDict *qdict)
613 {
614 Error *error = NULL;
615 diff --git a/hmp.h b/hmp.h
616 index 093d65f..c708b3f 100644
617 --- a/hmp.h
618 +++ b/hmp.h
619 @@ -30,6 +30,7 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict);
620 void hmp_info_migrate_capabilities(Monitor *mon, const QDict *qdict);
621 void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict);
622 void hmp_info_migrate_cache_size(Monitor *mon, const QDict *qdict);
623 +void hmp_info_backup(Monitor *mon, const QDict *qdict);
624 void hmp_info_cpus(Monitor *mon, const QDict *qdict);
625 void hmp_info_block(Monitor *mon, const QDict *qdict);
626 void hmp_info_blockstats(Monitor *mon, const QDict *qdict);
627 @@ -76,6 +77,8 @@ void hmp_eject(Monitor *mon, const QDict *qdict);
628 void hmp_change(Monitor *mon, const QDict *qdict);
629 void hmp_block_set_io_throttle(Monitor *mon, const QDict *qdict);
630 void hmp_block_stream(Monitor *mon, const QDict *qdict);
631 +void hmp_backup(Monitor *mon, const QDict *qdict);
632 +void hmp_backup_cancel(Monitor *mon, const QDict *qdict);
633 void hmp_block_job_set_speed(Monitor *mon, const QDict *qdict);
634 void hmp_block_job_cancel(Monitor *mon, const QDict *qdict);
635 void hmp_block_job_pause(Monitor *mon, const QDict *qdict);
636 diff --git a/qapi-schema.json b/qapi-schema.json
637 index f9ccfe4..4f673d4 100644
638 --- a/qapi-schema.json
639 +++ b/qapi-schema.json
640 @@ -356,6 +356,95 @@
641 ##
642 { 'command': 'query-events', 'returns': ['EventInfo'] }
644 +# @BackupStatus:
645 +#
646 +# Detailed backup status.
647 +#
648 +# @status: #optional string describing the current backup status.
649 +# This can be 'active', 'done', 'error'. If this field is not
650 +# returned, no backup process has been initiated
651 +#
652 +# @errmsg: #optional error message (only returned if status is 'error')
653 +#
654 +# @total: #optional total amount of bytes involved in the backup process
655 +#
656 +# @transferred: #optional amount of bytes already backed up.
657 +#
658 +# @zero-bytes: #optional amount of 'zero' bytes detected.
659 +#
660 +# @start-time: #optional time (epoch) when backup job started.
661 +#
662 +# @end-time: #optional time (epoch) when backup job finished.
663 +#
664 +# @backupfile: #optional backup file name
665 +#
666 +# @uuid: #optional uuid for this backup job
667 +#
668 +##
669 +{ 'struct': 'BackupStatus',
670 + 'data': {'*status': 'str', '*errmsg': 'str', '*total': 'int',
671 + '*transferred': 'int', '*zero-bytes': 'int',
672 + '*start-time': 'int', '*end-time': 'int',
673 + '*backup-file': 'str', '*uuid': 'str' } }
674 +
675 +##
676 +# @BackupFormat
677 +#
678 +# An enumeration of supported backup formats.
679 +#
680 +# @vma: Proxmox vma backup format
681 +##
682 +{ 'enum': 'BackupFormat',
683 + 'data': [ 'vma' ] }
684 +
685 +##
686 +# @backup:
687 +#
688 +# Starts a VM backup.
689 +#
690 +# @backup-file: the backup file name
691 +#
692 +# @format: format of the backup file
693 +#
694 +# @config-filename: #optional name of a configuration file to include into
695 +# the backup archive.
696 +#
697 +# @speed: #optional the maximum speed, in bytes per second
698 +#
699 +# @devlist: #optional list of block device names (separated by ',', ';'
700 +# or ':'). By default the backup includes all writable block devices.
701 +#
702 +# Returns: the uuid of the backup job
703 +#
704 +##
705 +{ 'command': 'backup', 'data': { 'backup-file': 'str',
706 + '*format': 'BackupFormat',
707 + '*config-file': 'str',
708 + '*devlist': 'str', '*speed': 'int' },
709 + 'returns': 'UuidInfo' }
710 +
711 +##
712 +# @query-backup
713 +#
714 +# Returns information about current/last backup task.
715 +#
716 +# Returns: @BackupStatus
717 +#
718 +##
719 +{ 'command': 'query-backup', 'returns': 'BackupStatus' }
720 +
721 +##
722 +# @backup-cancel
723 +#
724 +# Cancel the current executing backup process.
725 +#
726 +# Returns: nothing on success
727 +#
728 +# Notes: This command succeeds even if there is no backup process running.
729 +#
730 +##
731 +{ 'command': 'backup-cancel' }
732 +
733 ##
734 # @MigrationStats
735 #
736 diff --git a/qmp-commands.hx b/qmp-commands.hx
737 index 9388578..3f03c0d 100644
738 --- a/qmp-commands.hx
739 +++ b/qmp-commands.hx
740 @@ -1279,6 +1279,24 @@ Example:
741 EQMP
743 {
744 + .name = "backup",
745 + .args_type = "backup-file:s,format:s?,config-file:F?,speed:o?,devlist:s?",
746 + .mhandler.cmd_new = qmp_marshal_input_backup,
747 + },
748 +
749 + {
750 + .name = "backup-cancel",
751 + .args_type = "",
752 + .mhandler.cmd_new = qmp_marshal_input_backup_cancel,
753 + },
754 +
755 + {
756 + .name = "query-backup",
757 + .args_type = "",
758 + .mhandler.cmd_new = qmp_marshal_input_query_backup,
759 + },
760 +
761 + {
762 .name = "block-job-set-speed",
763 .args_type = "device:B,speed:o",
764 .mhandler.cmd_new = qmp_marshal_block_job_set_speed,
765 --
766 2.1.4