1 Index: new/block/backup.c
2 ===================================================================
3 --- new.orig/block/backup.c 2014-05-05 06:55:25.000000000 +0200
4 +++ new/block/backup.c 2014-05-05 09:24:11.000000000 +0200
6 BlockDriverState *target;
7 MirrorSyncMode sync_mode;
9 + BackupDumpFunc *dump_cb;
10 BlockdevOnError on_source_error;
11 BlockdevOnError on_target_error;
12 CoRwlock flush_rwlock;
17 + int64_t start_sec = start * BACKUP_SECTORS_PER_CLUSTER;
18 if (buffer_is_zero(iov.iov_base, iov.iov_len)) {
19 - ret = bdrv_co_write_zeroes(job->target,
20 - start * BACKUP_SECTORS_PER_CLUSTER,
21 - n, BDRV_REQ_MAY_UNMAP);
23 + ret = job->dump_cb(job->common.opaque, job->target, start_sec, n, NULL);
26 + ret = bdrv_co_write_zeroes(job->target, start_sec, n, BDRV_REQ_MAY_UNMAP);
29 - ret = bdrv_co_writev(job->target,
30 - start * BACKUP_SECTORS_PER_CLUSTER, n,
33 + ret = job->dump_cb(job->common.opaque, job->target, start_sec, n, bounce_buffer);
36 + ret = bdrv_co_writev(job->target, start_sec, n, &bounce_qiov);
40 trace_backup_do_cow_write_fail(job, start, ret);
43 BackupBlockJob *s = container_of(job, BackupBlockJob, common);
45 - bdrv_iostatus_reset(s->target);
47 + bdrv_iostatus_reset(s->target);
51 static const BlockJobDriver backup_job_driver = {
54 return block_job_error_action(&job->common, job->common.bs,
55 job->on_source_error, true, error);
57 + } else if (job->target) {
58 return block_job_error_action(&job->common, job->target,
59 job->on_target_error, false, error);
61 + return BDRV_ACTION_REPORT;
67 job->bitmap = hbitmap_alloc(end, 0);
69 - bdrv_set_enable_write_cache(target, true);
70 - bdrv_set_on_error(target, on_target_error, on_target_error);
71 - bdrv_iostatus_enable(target);
73 + bdrv_set_enable_write_cache(target, true);
74 + bdrv_set_on_error(target, on_target_error, on_target_error);
75 + bdrv_iostatus_enable(target);
78 bdrv_add_before_write_notifier(bs, &before_write);
82 hbitmap_free(job->bitmap);
84 - bdrv_iostatus_disable(target);
87 + bdrv_iostatus_disable(target);
91 block_job_completed(&job->common, ret);
94 int64_t speed, MirrorSyncMode sync_mode,
95 BlockdevOnError on_source_error,
96 BlockdevOnError on_target_error,
97 + BackupDumpFunc *dump_cb,
98 BlockDriverCompletionFunc *cb, void *opaque,
106 + assert(target || dump_cb);
109 if ((on_source_error == BLOCKDEV_ON_ERROR_STOP ||
110 @@ -382,10 +400,12 @@
114 + job->dump_cb = dump_cb;
115 job->on_source_error = on_source_error;
116 job->on_target_error = on_target_error;
117 job->target = target;
118 job->sync_mode = sync_mode;
119 + job->common.paused = paused;
120 job->common.len = len;
121 job->common.co = qemu_coroutine_create(backup_run);
122 qemu_coroutine_enter(job->common.co, job);
123 Index: new/blockdev.c
124 ===================================================================
125 --- new.orig/blockdev.c 2014-05-05 06:55:26.000000000 +0200
126 +++ new/blockdev.c 2014-05-05 09:16:48.000000000 +0200
127 @@ -2030,7 +2030,7 @@
130 backup_start(bs, target_bs, speed, sync, on_source_error, on_target_error,
131 - block_job_cb, bs, &local_err);
132 + NULL, block_job_cb, bs, false, &local_err);
133 if (local_err != NULL) {
134 bdrv_unref(target_bs);
135 error_propagate(errp, local_err);
136 Index: new/include/block/block_int.h
137 ===================================================================
138 --- new.orig/include/block/block_int.h 2014-05-05 06:55:26.000000000 +0200
139 +++ new/include/block/block_int.h 2014-05-05 09:16:48.000000000 +0200
141 #define BLOCK_OPT_ADAPTER_TYPE "adapter_type"
142 #define BLOCK_OPT_REDUNDANCY "redundancy"
144 +typedef int BackupDumpFunc(void *opaque, BlockDriverState *bs,
145 + int64_t sector_num, int n_sectors, unsigned char *buf);
147 typedef struct BdrvTrackedRequest {
148 BlockDriverState *bs;
151 int64_t speed, MirrorSyncMode sync_mode,
152 BlockdevOnError on_source_error,
153 BlockdevOnError on_target_error,
154 + BackupDumpFunc *dump_cb,
155 BlockDriverCompletionFunc *cb, void *opaque,
159 #endif /* BLOCK_INT_H */