2 ===================================================================
3 --- new.orig/blockdev.c 2014-05-05 09:16:48.000000000 +0200
4 +++ new/blockdev.c 2014-05-05 09:28:22.000000000 +0200
6 #include "qmp-commands.h"
8 #include "sysemu/arch_init.h"
11 static QTAILQ_HEAD(drivelist, DriveInfo) drives = QTAILQ_HEAD_INITIALIZER(drives);
18 static void eject_device(BlockDriverState *bs, int force, Error **errp)
20 if (bdrv_in_use(bs)) {
21 @@ -1826,6 +1826,437 @@
22 bdrv_put_ref_bh_schedule(bs);
25 +/* PVE backup related function */
27 +static struct PVEBackupState {
43 +typedef struct PVEBackupDevInfo {
44 + BlockDriverState *bs;
51 +static void pvebackup_run_next_job(void);
53 +static int pvebackup_dump_cb(void *opaque, BlockDriverState *target,
54 + int64_t sector_num, int n_sectors,
57 + PVEBackupDevInfo *di = opaque;
59 + if (sector_num & 0x7f) {
60 + if (!backup_state.error) {
61 + error_setg(&backup_state.error,
62 + "got unaligned write inside backup dump "
63 + "callback (sector %ld)", sector_num);
65 + return -1; // not aligned to cluster size
68 + int64_t cluster_num = sector_num >> 7;
69 + int size = n_sectors * BDRV_SECTOR_SIZE;
73 + if (backup_state.vmaw) {
74 + size_t zero_bytes = 0;
75 + ret = vma_writer_write(backup_state.vmaw, di->dev_id, cluster_num,
77 + backup_state.zero_bytes += zero_bytes;
81 + backup_state.zero_bytes += size;
85 + backup_state.transferred += size;
90 +static void pvebackup_cleanup(void)
92 + backup_state.end_time = time(NULL);
94 + if (backup_state.vmaw) {
95 + Error *local_err = NULL;
96 + vma_writer_close(backup_state.vmaw, &local_err);
97 + error_propagate(&backup_state.error, local_err);
98 + backup_state.vmaw = NULL;
101 + if (backup_state.di_list) {
102 + GList *l = backup_state.di_list;
104 + PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
105 + l = g_list_next(l);
108 + g_list_free(backup_state.di_list);
109 + backup_state.di_list = NULL;
113 +static void pvebackup_complete_cb(void *opaque, int ret)
115 + PVEBackupDevInfo *di = opaque;
117 + assert(backup_state.vmaw);
119 + di->completed = true;
121 + if (ret < 0 && !backup_state.error) {
122 + error_setg(&backup_state.error, "job failed with err %d - %s",
123 + ret, strerror(-ret));
126 + BlockDriverState *bs = di->bs;
130 + vma_writer_close_stream(backup_state.vmaw, di->dev_id);
132 + block_job_cb(bs, ret);
134 + if (!backup_state.cancel) {
135 + pvebackup_run_next_job();
139 +static void pvebackup_cancel(void *opaque)
141 + backup_state.cancel = true;
143 + if (!backup_state.error) {
144 + error_setg(&backup_state.error, "backup cancelled");
147 + /* drain all i/o (awake jobs waiting for aio) */
150 + GList *l = backup_state.di_list;
152 + PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
153 + l = g_list_next(l);
154 + if (!di->completed && di->bs) {
155 + BlockJob *job = di->bs->job;
157 + if (!di->completed) {
158 + block_job_cancel_sync(job);
164 + pvebackup_cleanup();
167 +void qmp_backup_cancel(Error **errp)
169 + Coroutine *co = qemu_coroutine_create(pvebackup_cancel);
170 + qemu_coroutine_enter(co, NULL);
172 + while (backup_state.vmaw) {
177 +static void pvebackup_run_next_job(void)
179 + GList *l = backup_state.di_list;
181 + PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
182 + l = g_list_next(l);
183 + if (!di->completed && di->bs && di->bs->job) {
184 + BlockJob *job = di->bs->job;
185 + if (block_job_is_paused(job)) {
186 + bool cancel = backup_state.error || backup_state.cancel;
188 + block_job_cancel(job);
190 + block_job_resume(job);
197 + pvebackup_cleanup();
200 +char *qmp_backup(const char *backup_file, bool has_format,
201 + BackupFormat format,
202 + bool has_config_file, const char *config_file,
203 + bool has_devlist, const char *devlist,
204 + bool has_speed, int64_t speed, Error **errp)
206 + BlockDriverState *bs;
207 + Error *local_err = NULL;
209 + VmaWriter *vmaw = NULL;
210 + gchar **devs = NULL;
211 + GList *di_list = NULL;
214 + if (backup_state.di_list) {
215 + error_set(errp, ERROR_CLASS_GENERIC_ERROR,
216 + "previous backup not finished");
220 + /* Todo: try to auto-detect format based on file name */
221 + format = has_format ? format : BACKUP_FORMAT_VMA;
223 + if (format != BACKUP_FORMAT_VMA) {
224 + error_set(errp, ERROR_CLASS_GENERIC_ERROR, "unknown backup format");
229 + devs = g_strsplit_set(devlist, ",;:", -1);
233 + bs = bdrv_find(*d);
235 + if (bdrv_is_read_only(bs)) {
236 + error_set(errp, QERR_DEVICE_IS_READ_ONLY, *d);
239 + if (!bdrv_is_inserted(bs)) {
240 + error_set(errp, QERR_DEVICE_HAS_NO_MEDIUM, *d);
243 + PVEBackupDevInfo *di = g_new0(PVEBackupDevInfo, 1);
245 + di_list = g_list_append(di_list, di);
247 + error_set(errp, QERR_DEVICE_NOT_FOUND, *d);
256 + while ((bs = bdrv_next(bs))) {
258 + if (!bdrv_is_inserted(bs) || bdrv_is_read_only(bs)) {
262 + PVEBackupDevInfo *di = g_new0(PVEBackupDevInfo, 1);
264 + di_list = g_list_append(di_list, di);
269 + error_set(errp, ERROR_CLASS_GENERIC_ERROR, "empty device list");
277 + PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
278 + l = g_list_next(l);
279 + if (bdrv_in_use(di->bs)) {
280 + error_set(errp, QERR_DEVICE_IN_USE, bdrv_get_device_name(di->bs));
284 + ssize_t size = bdrv_getlength(di->bs);
286 + error_setg_errno(errp, -di->size, "bdrv_getlength failed");
293 + uuid_generate(uuid);
295 + vmaw = vma_writer_create(backup_file, uuid, &local_err);
297 + if (error_is_set(&local_err)) {
298 + error_propagate(errp, local_err);
303 + /* register all devices for vma writer */
306 + PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
307 + l = g_list_next(l);
309 + const char *devname = bdrv_get_device_name(di->bs);
310 + di->dev_id = vma_writer_register_stream(vmaw, devname, di->size);
311 + if (di->dev_id <= 0) {
312 + error_set(errp, ERROR_CLASS_GENERIC_ERROR,
313 + "register_stream failed");
318 + /* add configuration file to archive */
319 + if (has_config_file) {
320 + char *cdata = NULL;
322 + GError *err = NULL;
323 + if (!g_file_get_contents(config_file, &cdata, &clen, &err)) {
324 + error_setg(errp, "unable to read file '%s'", config_file);
328 + const char *basename = g_path_get_basename(config_file);
329 + if (vma_writer_add_config(vmaw, basename, cdata, clen) != 0) {
330 + error_setg(errp, "unable to add config data to vma archive");
337 + /* initialize global backup_state now */
339 + backup_state.cancel = false;
341 + if (backup_state.error) {
342 + error_free(backup_state.error);
343 + backup_state.error = NULL;
346 + backup_state.speed = (has_speed && speed > 0) ? speed : 0;
348 + backup_state.start_time = time(NULL);
349 + backup_state.end_time = 0;
351 + if (backup_state.backup_file) {
352 + g_free(backup_state.backup_file);
354 + backup_state.backup_file = g_strdup(backup_file);
356 + backup_state.vmaw = vmaw;
358 + uuid_copy(backup_state.uuid, uuid);
359 + uuid_unparse_lower(uuid, backup_state.uuid_str);
361 + backup_state.di_list = di_list;
363 + backup_state.total = total;
364 + backup_state.transferred = 0;
365 + backup_state.zero_bytes = 0;
367 + /* start all jobs (paused state) */
370 + PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
371 + l = g_list_next(l);
373 + backup_start(di->bs, NULL, speed, MIRROR_SYNC_MODE_FULL,
374 + BLOCKDEV_ON_ERROR_REPORT, BLOCKDEV_ON_ERROR_REPORT,
375 + pvebackup_dump_cb, pvebackup_complete_cb, di,
377 + if (local_err != NULL) {
378 + error_setg(&backup_state.error, "backup_job_create failed");
379 + pvebackup_cancel(NULL);
383 + if (!backup_state.error) {
384 + pvebackup_run_next_job(); // run one job
387 + return g_strdup(backup_state.uuid_str);
394 + l = g_list_next(l);
396 + g_list_free(di_list);
404 + vma_writer_close(vmaw, &err);
405 + unlink(backup_file);
411 +BackupStatus *qmp_query_backup(Error **errp)
413 + BackupStatus *info = g_malloc0(sizeof(*info));
415 + if (!backup_state.start_time) {
416 + /* not started, return {} */
420 + info->has_status = true;
421 + info->has_start_time = true;
422 + info->start_time = backup_state.start_time;
424 + if (backup_state.backup_file) {
425 + info->has_backup_file = true;
426 + info->backup_file = g_strdup(backup_state.backup_file);
429 + info->has_uuid = true;
430 + info->uuid = g_strdup(backup_state.uuid_str);
432 + if (backup_state.end_time) {
433 + if (backup_state.error) {
434 + info->status = g_strdup("error");
435 + info->has_errmsg = true;
436 + info->errmsg = g_strdup(error_get_pretty(backup_state.error));
438 + info->status = g_strdup("done");
440 + info->has_end_time = true;
441 + info->end_time = backup_state.end_time;
443 + info->status = g_strdup("active");
446 + info->has_total = true;
447 + info->total = backup_state.total;
448 + info->has_zero_bytes = true;
449 + info->zero_bytes = backup_state.zero_bytes;
450 + info->has_transferred = true;
451 + info->transferred = backup_state.transferred;
456 void qmp_block_stream(const char *device, bool has_base,
457 const char *base, bool has_speed, int64_t speed,
458 bool has_on_error, BlockdevOnError on_error,
459 Index: new/hmp-commands.hx
460 ===================================================================
461 --- new.orig/hmp-commands.hx 2014-05-05 06:55:26.000000000 +0200
462 +++ new/hmp-commands.hx 2014-05-05 09:28:22.000000000 +0200
464 Copy data from a backing file into a block device.
469 + .args_type = "backupfile:s,speed:o?,devlist:s?",
470 + .params = "backupfile [speed [devlist]]",
471 + .help = "create a VM Backup.",
472 + .mhandler.cmd = hmp_backup,
482 + .name = "backup_cancel",
485 + .help = "cancel the current VM backup",
486 + .mhandler.cmd = hmp_backup_cancel,
491 +@findex backup_cancel
492 +Cancel the current VM backup.
497 .name = "block_job_set_speed",
498 .args_type = "device:B,speed:o",
499 @@ -1738,6 +1767,8 @@
502 show user network stack connection states
506 show migration status
507 @item info migrate_capabilities
509 ===================================================================
510 --- new.orig/hmp.c 2014-05-05 07:34:43.000000000 +0200
511 +++ new/hmp.c 2014-05-05 09:28:22.000000000 +0200
513 qapi_free_MouseInfoList(mice_list);
516 +void hmp_info_backup(Monitor *mon, const QDict *qdict)
518 + BackupStatus *info;
520 + info = qmp_query_backup(NULL);
521 + if (info->has_status) {
522 + if (info->has_errmsg) {
523 + monitor_printf(mon, "Backup status: %s - %s\n",
524 + info->status, info->errmsg);
526 + monitor_printf(mon, "Backup status: %s\n", info->status);
530 + if (info->has_backup_file) {
531 + monitor_printf(mon, "Start time: %s", ctime(&info->start_time));
532 + if (info->end_time) {
533 + monitor_printf(mon, "End time: %s", ctime(&info->end_time));
536 + int per = (info->has_total && info->total &&
537 + info->has_transferred && info->transferred) ?
538 + (info->transferred * 100)/info->total : 0;
539 + int zero_per = (info->has_total && info->total &&
540 + info->has_zero_bytes && info->zero_bytes) ?
541 + (info->zero_bytes * 100)/info->total : 0;
542 + monitor_printf(mon, "Backup file: %s\n", info->backup_file);
543 + monitor_printf(mon, "Backup uuid: %s\n", info->uuid);
544 + monitor_printf(mon, "Total size: %zd\n", info->total);
545 + monitor_printf(mon, "Transferred bytes: %zd (%d%%)\n",
546 + info->transferred, per);
547 + monitor_printf(mon, "Zero bytes: %zd (%d%%)\n",
548 + info->zero_bytes, zero_per);
551 + qapi_free_BackupStatus(info);
554 void hmp_info_migrate(Monitor *mon, const QDict *qdict)
557 @@ -1196,6 +1234,29 @@
559 hmp_handle_error(mon, &error);
562 +void hmp_backup_cancel(Monitor *mon, const QDict *qdict)
564 + Error *error = NULL;
566 + qmp_backup_cancel(&error);
568 + hmp_handle_error(mon, &error);
571 +void hmp_backup(Monitor *mon, const QDict *qdict)
573 + Error *error = NULL;
575 + const char *backup_file = qdict_get_str(qdict, "backupfile");
576 + const char *devlist = qdict_get_try_str(qdict, "devlist");
577 + int64_t speed = qdict_get_try_int(qdict, "speed", 0);
579 + qmp_backup(backup_file, true, BACKUP_FORMAT_VMA, false, NULL, !!devlist,
580 + devlist, qdict_haskey(qdict, "speed"), speed, &error);
582 + hmp_handle_error(mon, &error);
585 void hmp_block_job_set_speed(Monitor *mon, const QDict *qdict)
588 ===================================================================
589 --- new.orig/hmp.h 2014-05-05 06:55:26.000000000 +0200
590 +++ new/hmp.h 2014-05-05 09:28:22.000000000 +0200
592 void hmp_info_migrate(Monitor *mon, const QDict *qdict);
593 void hmp_info_migrate_capabilities(Monitor *mon, const QDict *qdict);
594 void hmp_info_migrate_cache_size(Monitor *mon, const QDict *qdict);
595 +void hmp_info_backup(Monitor *mon, const QDict *qdict);
596 void hmp_info_cpus(Monitor *mon, const QDict *qdict);
597 void hmp_info_block(Monitor *mon, const QDict *qdict);
598 void hmp_info_blockstats(Monitor *mon, const QDict *qdict);
600 void hmp_change(Monitor *mon, const QDict *qdict);
601 void hmp_block_set_io_throttle(Monitor *mon, const QDict *qdict);
602 void hmp_block_stream(Monitor *mon, const QDict *qdict);
603 +void hmp_backup(Monitor *mon, const QDict *qdict);
604 +void hmp_backup_cancel(Monitor *mon, const QDict *qdict);
605 void hmp_block_job_set_speed(Monitor *mon, const QDict *qdict);
606 void hmp_block_job_cancel(Monitor *mon, const QDict *qdict);
607 void hmp_block_job_pause(Monitor *mon, const QDict *qdict);
609 ===================================================================
610 --- new.orig/monitor.c 2014-05-05 06:55:26.000000000 +0200
611 +++ new/monitor.c 2014-05-05 09:28:22.000000000 +0200
612 @@ -2903,6 +2903,13 @@
619 + .help = "show backup status",
620 + .mhandler.cmd = hmp_info_backup,
626 Index: new/qapi-schema.json
627 ===================================================================
628 --- new.orig/qapi-schema.json 2014-05-05 08:17:59.000000000 +0200
629 +++ new/qapi-schema.json 2014-05-05 09:28:22.000000000 +0200
632 { 'command': 'query-events', 'returns': ['EventInfo'] }
636 +# Detailed backup status.
638 +# @status: #optional string describing the current backup status.
639 +# This can be 'active', 'done', 'error'. If this field is not
640 +# returned, no backup process has been initiated
642 +# @errmsg: #optional error message (only returned if status is 'error')
644 +# @total: #optional total amount of bytes involved in the backup process
646 +# @transferred: #optional amount of bytes already backed up.
648 +# @zero-bytes: #optional amount of 'zero' bytes detected.
650 +# @start-time: #optional time (epoch) when backup job started.
652 +# @end-time: #optional time (epoch) when backup job finished.
654 +# @backupfile: #optional backup file name
656 +# @uuid: #optional uuid for this backup job
659 +{ 'type': 'BackupStatus',
660 + 'data': {'*status': 'str', '*errmsg': 'str', '*total': 'int',
661 + '*transferred': 'int', '*zero-bytes': 'int',
662 + '*start-time': 'int', '*end-time': 'int',
663 + '*backup-file': 'str', '*uuid': 'str' } }
668 +# An enumeration of supported backup formats.
670 +# @vma: Proxmox vma backup format
672 +{ 'enum': 'BackupFormat',
673 + 'data': [ 'vma' ] }
678 +# Starts a VM backup.
680 +# @backup-file: the backup file name
682 +# @format: format of the backup file
684 +# @config-filename: #optional name of a configuration file to include into
685 +# the backup archive.
687 +# @speed: #optional the maximum speed, in bytes per second
689 +# @devlist: #optional list of block device names (separated by ',', ';'
690 +# or ':'). By default the backup includes all writable block devices.
692 +# Returns: the uuid of the backup job
695 +{ 'command': 'backup', 'data': { 'backup-file': 'str',
696 + '*format': 'BackupFormat',
697 + '*config-file': 'str',
698 + '*devlist': 'str', '*speed': 'int' },
704 +# Returns information about current/last backup task.
706 +# Returns: @BackupStatus
709 +{ 'command': 'query-backup', 'returns': 'BackupStatus' }
714 +# Cancel the current executing backup process.
716 +# Returns: nothing on success
718 +# Notes: This command succeeds even if there is no backup process running.
721 +{ 'command': 'backup-cancel' }
726 Index: new/qmp-commands.hx
727 ===================================================================
728 --- new.orig/qmp-commands.hx 2014-05-05 07:34:43.000000000 +0200
729 +++ new/qmp-commands.hx 2014-05-05 09:28:22.000000000 +0200
730 @@ -1080,6 +1080,24 @@
735 + .args_type = "backup-file:s,format:s?,config-file:F?,speed:o?,devlist:s?",
736 + .mhandler.cmd_new = qmp_marshal_input_backup,
740 + .name = "backup-cancel",
742 + .mhandler.cmd_new = qmp_marshal_input_backup_cancel,
746 + .name = "query-backup",
748 + .mhandler.cmd_new = qmp_marshal_input_query_backup,
752 .name = "block-job-set-speed",
753 .args_type = "device:B,speed:o",
754 .mhandler.cmd_new = qmp_marshal_input_block_job_set_speed,