2 ===================================================================
3 --- new.orig/blockdev.c 2014-11-20 07:36:12.000000000 +0100
4 +++ new/blockdev.c 2014-11-20 07:47:31.000000000 +0100
6 #include "qmp-commands.h"
8 #include "sysemu/arch_init.h"
11 static const char *const if_name[IF_COUNT] = {
13 @@ -1954,6 +1955,437 @@
14 bdrv_put_ref_bh_schedule(bs);
17 +/* PVE backup related function */
19 +static struct PVEBackupState {
35 +typedef struct PVEBackupDevInfo {
36 + BlockDriverState *bs;
43 +static void pvebackup_run_next_job(void);
45 +static int pvebackup_dump_cb(void *opaque, BlockDriverState *target,
46 + int64_t sector_num, int n_sectors,
49 + PVEBackupDevInfo *di = opaque;
51 + if (sector_num & 0x7f) {
52 + if (!backup_state.error) {
53 + error_setg(&backup_state.error,
54 + "got unaligned write inside backup dump "
55 + "callback (sector %ld)", sector_num);
57 + return -1; // not aligned to cluster size
60 + int64_t cluster_num = sector_num >> 7;
61 + int size = n_sectors * BDRV_SECTOR_SIZE;
65 + if (backup_state.vmaw) {
66 + size_t zero_bytes = 0;
67 + ret = vma_writer_write(backup_state.vmaw, di->dev_id, cluster_num,
69 + backup_state.zero_bytes += zero_bytes;
73 + backup_state.zero_bytes += size;
77 + backup_state.transferred += size;
82 +static void pvebackup_cleanup(void)
84 + backup_state.end_time = time(NULL);
86 + if (backup_state.vmaw) {
87 + Error *local_err = NULL;
88 + vma_writer_close(backup_state.vmaw, &local_err);
89 + error_propagate(&backup_state.error, local_err);
90 + backup_state.vmaw = NULL;
93 + if (backup_state.di_list) {
94 + GList *l = backup_state.di_list;
96 + PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
100 + g_list_free(backup_state.di_list);
101 + backup_state.di_list = NULL;
105 +static void pvebackup_complete_cb(void *opaque, int ret)
107 + PVEBackupDevInfo *di = opaque;
109 + assert(backup_state.vmaw);
111 + di->completed = true;
113 + if (ret < 0 && !backup_state.error) {
114 + error_setg(&backup_state.error, "job failed with err %d - %s",
115 + ret, strerror(-ret));
118 + BlockDriverState *bs = di->bs;
122 + vma_writer_close_stream(backup_state.vmaw, di->dev_id);
124 + block_job_cb(bs, ret);
126 + if (!backup_state.cancel) {
127 + pvebackup_run_next_job();
131 +static void pvebackup_cancel(void *opaque)
133 + backup_state.cancel = true;
135 + if (!backup_state.error) {
136 + error_setg(&backup_state.error, "backup cancelled");
139 + /* drain all i/o (awake jobs waiting for aio) */
142 + GList *l = backup_state.di_list;
144 + PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
145 + l = g_list_next(l);
146 + if (!di->completed && di->bs) {
147 + BlockJob *job = di->bs->job;
149 + if (!di->completed) {
150 + block_job_cancel_sync(job);
156 + pvebackup_cleanup();
159 +void qmp_backup_cancel(Error **errp)
161 + Coroutine *co = qemu_coroutine_create(pvebackup_cancel);
162 + qemu_coroutine_enter(co, NULL);
164 + while (backup_state.vmaw) {
165 + /* vma writer use main aio context */
166 + aio_poll(qemu_get_aio_context(), true);
170 +static void pvebackup_run_next_job(void)
172 + GList *l = backup_state.di_list;
174 + PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
175 + l = g_list_next(l);
176 + if (!di->completed && di->bs && di->bs->job) {
177 + BlockJob *job = di->bs->job;
178 + if (block_job_is_paused(job)) {
179 + bool cancel = backup_state.error || backup_state.cancel;
181 + block_job_cancel(job);
183 + block_job_resume(job);
190 + pvebackup_cleanup();
193 +char *qmp_backup(const char *backup_file, bool has_format,
194 + BackupFormat format,
195 + bool has_config_file, const char *config_file,
196 + bool has_devlist, const char *devlist,
197 + bool has_speed, int64_t speed, Error **errp)
199 + BlockDriverState *bs;
200 + Error *local_err = NULL;
202 + VmaWriter *vmaw = NULL;
203 + gchar **devs = NULL;
204 + GList *di_list = NULL;
207 + if (backup_state.di_list) {
208 + error_set(errp, ERROR_CLASS_GENERIC_ERROR,
209 + "previous backup not finished");
213 + /* Todo: try to auto-detect format based on file name */
214 + format = has_format ? format : BACKUP_FORMAT_VMA;
216 + if (format != BACKUP_FORMAT_VMA) {
217 + error_set(errp, ERROR_CLASS_GENERIC_ERROR, "unknown backup format");
222 + devs = g_strsplit_set(devlist, ",;:", -1);
226 + bs = bdrv_find(*d);
228 + if (bdrv_is_read_only(bs)) {
229 + error_set(errp, QERR_DEVICE_IS_READ_ONLY, *d);
232 + if (!bdrv_is_inserted(bs)) {
233 + error_set(errp, QERR_DEVICE_HAS_NO_MEDIUM, *d);
236 + PVEBackupDevInfo *di = g_new0(PVEBackupDevInfo, 1);
238 + di_list = g_list_append(di_list, di);
240 + error_set(errp, QERR_DEVICE_NOT_FOUND, *d);
249 + while ((bs = bdrv_next(bs))) {
251 + if (!bdrv_is_inserted(bs) || bdrv_is_read_only(bs)) {
255 + PVEBackupDevInfo *di = g_new0(PVEBackupDevInfo, 1);
257 + di_list = g_list_append(di_list, di);
262 + error_set(errp, ERROR_CLASS_GENERIC_ERROR, "empty device list");
270 + PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
271 + l = g_list_next(l);
272 + if (bdrv_op_is_blocked(di->bs, BLOCK_OP_TYPE_BACKUP_SOURCE, errp)) {
276 + ssize_t size = bdrv_getlength(di->bs);
278 + error_setg_errno(errp, -di->size, "bdrv_getlength failed");
285 + uuid_generate(uuid);
287 + vmaw = vma_writer_create(backup_file, uuid, &local_err);
290 + error_propagate(errp, local_err);
295 + /* register all devices for vma writer */
298 + PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
299 + l = g_list_next(l);
301 + const char *devname = bdrv_get_device_name(di->bs);
302 + di->dev_id = vma_writer_register_stream(vmaw, devname, di->size);
303 + if (di->dev_id <= 0) {
304 + error_set(errp, ERROR_CLASS_GENERIC_ERROR,
305 + "register_stream failed");
310 + /* add configuration file to archive */
311 + if (has_config_file) {
312 + char *cdata = NULL;
314 + GError *err = NULL;
315 + if (!g_file_get_contents(config_file, &cdata, &clen, &err)) {
316 + error_setg(errp, "unable to read file '%s'", config_file);
320 + const char *basename = g_path_get_basename(config_file);
321 + if (vma_writer_add_config(vmaw, basename, cdata, clen) != 0) {
322 + error_setg(errp, "unable to add config data to vma archive");
329 + /* initialize global backup_state now */
331 + backup_state.cancel = false;
333 + if (backup_state.error) {
334 + error_free(backup_state.error);
335 + backup_state.error = NULL;
338 + backup_state.speed = (has_speed && speed > 0) ? speed : 0;
340 + backup_state.start_time = time(NULL);
341 + backup_state.end_time = 0;
343 + if (backup_state.backup_file) {
344 + g_free(backup_state.backup_file);
346 + backup_state.backup_file = g_strdup(backup_file);
348 + backup_state.vmaw = vmaw;
350 + uuid_copy(backup_state.uuid, uuid);
351 + uuid_unparse_lower(uuid, backup_state.uuid_str);
353 + backup_state.di_list = di_list;
355 + backup_state.total = total;
356 + backup_state.transferred = 0;
357 + backup_state.zero_bytes = 0;
359 + /* start all jobs (paused state) */
362 + PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
363 + l = g_list_next(l);
365 + backup_start(di->bs, NULL, speed, MIRROR_SYNC_MODE_FULL,
366 + BLOCKDEV_ON_ERROR_REPORT, BLOCKDEV_ON_ERROR_REPORT,
367 + pvebackup_dump_cb, pvebackup_complete_cb, di,
369 + if (local_err != NULL) {
370 + error_setg(&backup_state.error, "backup_job_create failed");
371 + pvebackup_cancel(NULL);
375 + if (!backup_state.error) {
376 + pvebackup_run_next_job(); // run one job
379 + return g_strdup(backup_state.uuid_str);
386 + l = g_list_next(l);
388 + g_list_free(di_list);
396 + vma_writer_close(vmaw, &err);
397 + unlink(backup_file);
403 +BackupStatus *qmp_query_backup(Error **errp)
405 + BackupStatus *info = g_malloc0(sizeof(*info));
407 + if (!backup_state.start_time) {
408 + /* not started, return {} */
412 + info->has_status = true;
413 + info->has_start_time = true;
414 + info->start_time = backup_state.start_time;
416 + if (backup_state.backup_file) {
417 + info->has_backup_file = true;
418 + info->backup_file = g_strdup(backup_state.backup_file);
421 + info->has_uuid = true;
422 + info->uuid = g_strdup(backup_state.uuid_str);
424 + if (backup_state.end_time) {
425 + if (backup_state.error) {
426 + info->status = g_strdup("error");
427 + info->has_errmsg = true;
428 + info->errmsg = g_strdup(error_get_pretty(backup_state.error));
430 + info->status = g_strdup("done");
432 + info->has_end_time = true;
433 + info->end_time = backup_state.end_time;
435 + info->status = g_strdup("active");
438 + info->has_total = true;
439 + info->total = backup_state.total;
440 + info->has_zero_bytes = true;
441 + info->zero_bytes = backup_state.zero_bytes;
442 + info->has_transferred = true;
443 + info->transferred = backup_state.transferred;
448 void qmp_block_stream(const char *device,
449 bool has_base, const char *base,
450 bool has_backing_file, const char *backing_file,
451 Index: new/hmp-commands.hx
452 ===================================================================
453 --- new.orig/hmp-commands.hx 2014-11-20 06:45:05.000000000 +0100
454 +++ new/hmp-commands.hx 2014-11-20 07:47:31.000000000 +0100
456 Copy data from a backing file into a block device.
461 + .args_type = "backupfile:s,speed:o?,devlist:s?",
462 + .params = "backupfile [speed [devlist]]",
463 + .help = "create a VM Backup.",
464 + .mhandler.cmd = hmp_backup,
474 + .name = "backup_cancel",
477 + .help = "cancel the current VM backup",
478 + .mhandler.cmd = hmp_backup_cancel,
483 +@findex backup_cancel
484 +Cancel the current VM backup.
489 .name = "block_job_set_speed",
490 .args_type = "device:B,speed:o",
491 @@ -1760,6 +1789,8 @@
494 show user network stack connection states
498 show migration status
499 @item info migrate_capabilities
501 ===================================================================
502 --- new.orig/hmp.c 2014-11-20 07:26:23.000000000 +0100
503 +++ new/hmp.c 2014-11-20 07:47:31.000000000 +0100
505 qapi_free_MouseInfoList(mice_list);
508 +void hmp_info_backup(Monitor *mon, const QDict *qdict)
510 + BackupStatus *info;
512 + info = qmp_query_backup(NULL);
513 + if (info->has_status) {
514 + if (info->has_errmsg) {
515 + monitor_printf(mon, "Backup status: %s - %s\n",
516 + info->status, info->errmsg);
518 + monitor_printf(mon, "Backup status: %s\n", info->status);
522 + if (info->has_backup_file) {
523 + monitor_printf(mon, "Start time: %s", ctime(&info->start_time));
524 + if (info->end_time) {
525 + monitor_printf(mon, "End time: %s", ctime(&info->end_time));
528 + int per = (info->has_total && info->total &&
529 + info->has_transferred && info->transferred) ?
530 + (info->transferred * 100)/info->total : 0;
531 + int zero_per = (info->has_total && info->total &&
532 + info->has_zero_bytes && info->zero_bytes) ?
533 + (info->zero_bytes * 100)/info->total : 0;
534 + monitor_printf(mon, "Backup file: %s\n", info->backup_file);
535 + monitor_printf(mon, "Backup uuid: %s\n", info->uuid);
536 + monitor_printf(mon, "Total size: %zd\n", info->total);
537 + monitor_printf(mon, "Transferred bytes: %zd (%d%%)\n",
538 + info->transferred, per);
539 + monitor_printf(mon, "Zero bytes: %zd (%d%%)\n",
540 + info->zero_bytes, zero_per);
543 + qapi_free_BackupStatus(info);
546 void hmp_info_migrate(Monitor *mon, const QDict *qdict)
549 @@ -1212,6 +1250,29 @@
551 hmp_handle_error(mon, &error);
554 +void hmp_backup_cancel(Monitor *mon, const QDict *qdict)
556 + Error *error = NULL;
558 + qmp_backup_cancel(&error);
560 + hmp_handle_error(mon, &error);
563 +void hmp_backup(Monitor *mon, const QDict *qdict)
565 + Error *error = NULL;
567 + const char *backup_file = qdict_get_str(qdict, "backupfile");
568 + const char *devlist = qdict_get_try_str(qdict, "devlist");
569 + int64_t speed = qdict_get_try_int(qdict, "speed", 0);
571 + qmp_backup(backup_file, true, BACKUP_FORMAT_VMA, false, NULL, !!devlist,
572 + devlist, qdict_haskey(qdict, "speed"), speed, &error);
574 + hmp_handle_error(mon, &error);
577 void hmp_block_job_set_speed(Monitor *mon, const QDict *qdict)
580 ===================================================================
581 --- new.orig/hmp.h 2014-11-20 06:45:05.000000000 +0100
582 +++ new/hmp.h 2014-11-20 07:47:31.000000000 +0100
584 void hmp_info_migrate(Monitor *mon, const QDict *qdict);
585 void hmp_info_migrate_capabilities(Monitor *mon, const QDict *qdict);
586 void hmp_info_migrate_cache_size(Monitor *mon, const QDict *qdict);
587 +void hmp_info_backup(Monitor *mon, const QDict *qdict);
588 void hmp_info_cpus(Monitor *mon, const QDict *qdict);
589 void hmp_info_block(Monitor *mon, const QDict *qdict);
590 void hmp_info_blockstats(Monitor *mon, const QDict *qdict);
592 void hmp_change(Monitor *mon, const QDict *qdict);
593 void hmp_block_set_io_throttle(Monitor *mon, const QDict *qdict);
594 void hmp_block_stream(Monitor *mon, const QDict *qdict);
595 +void hmp_backup(Monitor *mon, const QDict *qdict);
596 +void hmp_backup_cancel(Monitor *mon, const QDict *qdict);
597 void hmp_block_job_set_speed(Monitor *mon, const QDict *qdict);
598 void hmp_block_job_cancel(Monitor *mon, const QDict *qdict);
599 void hmp_block_job_pause(Monitor *mon, const QDict *qdict);
601 ===================================================================
602 --- new.orig/monitor.c 2014-11-20 06:45:06.000000000 +0100
603 +++ new/monitor.c 2014-11-20 07:47:31.000000000 +0100
604 @@ -2848,6 +2848,13 @@
611 + .help = "show backup status",
612 + .mhandler.cmd = hmp_info_backup,
618 Index: new/qapi-schema.json
619 ===================================================================
620 --- new.orig/qapi-schema.json 2014-11-20 07:26:43.000000000 +0100
621 +++ new/qapi-schema.json 2014-11-20 07:47:31.000000000 +0100
624 { 'command': 'query-events', 'returns': ['EventInfo'] }
628 +# Detailed backup status.
630 +# @status: #optional string describing the current backup status.
631 +# This can be 'active', 'done', 'error'. If this field is not
632 +# returned, no backup process has been initiated
634 +# @errmsg: #optional error message (only returned if status is 'error')
636 +# @total: #optional total amount of bytes involved in the backup process
638 +# @transferred: #optional amount of bytes already backed up.
640 +# @zero-bytes: #optional amount of 'zero' bytes detected.
642 +# @start-time: #optional time (epoch) when backup job started.
644 +# @end-time: #optional time (epoch) when backup job finished.
646 +# @backupfile: #optional backup file name
648 +# @uuid: #optional uuid for this backup job
651 +{ 'type': 'BackupStatus',
652 + 'data': {'*status': 'str', '*errmsg': 'str', '*total': 'int',
653 + '*transferred': 'int', '*zero-bytes': 'int',
654 + '*start-time': 'int', '*end-time': 'int',
655 + '*backup-file': 'str', '*uuid': 'str' } }
660 +# An enumeration of supported backup formats.
662 +# @vma: Proxmox vma backup format
664 +{ 'enum': 'BackupFormat',
665 + 'data': [ 'vma' ] }
670 +# Starts a VM backup.
672 +# @backup-file: the backup file name
674 +# @format: format of the backup file
676 +# @config-filename: #optional name of a configuration file to include into
677 +# the backup archive.
679 +# @speed: #optional the maximum speed, in bytes per second
681 +# @devlist: #optional list of block device names (separated by ',', ';'
682 +# or ':'). By default the backup includes all writable block devices.
684 +# Returns: the uuid of the backup job
687 +{ 'command': 'backup', 'data': { 'backup-file': 'str',
688 + '*format': 'BackupFormat',
689 + '*config-file': 'str',
690 + '*devlist': 'str', '*speed': 'int' },
696 +# Returns information about current/last backup task.
698 +# Returns: @BackupStatus
701 +{ 'command': 'query-backup', 'returns': 'BackupStatus' }
706 +# Cancel the current executing backup process.
708 +# Returns: nothing on success
710 +# Notes: This command succeeds even if there is no backup process running.
713 +{ 'command': 'backup-cancel' }
718 Index: new/qmp-commands.hx
719 ===================================================================
720 --- new.orig/qmp-commands.hx 2014-11-20 07:26:23.000000000 +0100
721 +++ new/qmp-commands.hx 2014-11-20 07:47:31.000000000 +0100
722 @@ -1097,6 +1097,24 @@
727 + .args_type = "backup-file:s,format:s?,config-file:F?,speed:o?,devlist:s?",
728 + .mhandler.cmd_new = qmp_marshal_input_backup,
732 + .name = "backup-cancel",
734 + .mhandler.cmd_new = qmp_marshal_input_backup_cancel,
738 + .name = "query-backup",
740 + .mhandler.cmd_new = qmp_marshal_input_query_backup,
744 .name = "block-job-set-speed",
745 .args_type = "device:B,speed:o",
746 .mhandler.cmd_new = qmp_marshal_input_block_job_set_speed,