debian/patches/old/backup-modify-job-api.patch

   1 Index: new/block/backup.c
   2 ===================================================================
   3 --- new.orig/block/backup.c     2014-11-20 07:55:31.000000000 +0100
   4 +++ new/block/backup.c  2014-11-20 08:56:23.000000000 +0100
   5 @@ -42,6 +42,7 @@
   6      BdrvDirtyBitmap *sync_bitmap;
   7      MirrorSyncMode sync_mode;
   8      RateLimit limit;
   9 +    BackupDumpFunc *dump_cb;
  10      BlockdevOnError on_source_error;
  11      BlockdevOnError on_target_error;
  12      CoRwlock flush_rwlock;
  13 @@ -139,14 +140,21 @@
  14              goto out;
  15          }
  16
  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);
  22 +            if (job->dump_cb) {
  23 +                ret = job->dump_cb(job->common.opaque, job->target, start_sec, n, NULL);
  24 +            }
  25 +            if (job->target) {
  26 +                ret = bdrv_co_write_zeroes(job->target, start_sec, n, BDRV_REQ_MAY_UNMAP);
  27 +            }
  28          } else {
  29 -            ret = bdrv_co_writev(job->target,
  30 -                                 start * BACKUP_SECTORS_PER_CLUSTER, n,
  31 -                                 &bounce_qiov);
  32 +            if (job->dump_cb) {
  33 +                ret = job->dump_cb(job->common.opaque, job->target, start_sec, n, bounce_buffer);
  34 +            }
  35 +            if (job->target) {
  36 +                ret = bdrv_co_writev(job->target, start_sec, n, &bounce_qiov);
  37 +            }
  38          }
  39          if (ret < 0) {
  40              trace_backup_do_cow_write_fail(job, start, ret);
  41 @@ -208,7 +216,9 @@
  42  {
  43      BackupBlockJob *s = container_of(job, BackupBlockJob, common);
  44
  45 -    bdrv_iostatus_reset(s->target);
  46 +    if (s->target) {
  47 +        bdrv_iostatus_reset(s->target);
  48 +    }
  49  }
  50
  51  static const BlockJobDriver backup_job_driver = {
  52 @@ -224,9 +234,11 @@
  53      if (read) {
  54          return block_job_error_action(&job->common, job->common.bs,
  55                                        job->on_source_error, true, error);
  56 -    } else {
  57 +    } else if (job->target) {
  58          return block_job_error_action(&job->common, job->target,
  59                                        job->on_target_error, false, error);
  60 +    } else {
  61 +        return BLOCK_ERROR_ACTION_REPORT;
  62      }
  63  }
  64
  65 @@ -351,9 +363,11 @@
  66
  67      job->bitmap = hbitmap_alloc(end, 0);
  68
  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);
  72 +    if (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);
  76 +    }
  77
  78      bdrv_add_before_write_notifier(bs, &before_write);
  79
  80 @@ -443,8 +461,10 @@
  81      }
  82      hbitmap_free(job->bitmap);
  83
  84 -    bdrv_iostatus_disable(target);
  85 -    bdrv_op_unblock_all(target, job->common.blocker);
  86 +    if (target) {
  87 +        bdrv_iostatus_disable(target);
  88 +        bdrv_op_unblock_all(target, job->common.blocker);
  89 +    }
  90
  91      data = g_malloc(sizeof(*data));
  92      data->ret = ret;
  93 @@ -456,13 +472,15 @@ for backup_start
  94                    BdrvDirtyBitmap *sync_bitmap,
  95                    BlockdevOnError on_source_error,
  96                    BlockdevOnError on_target_error,
  97 +                  BackupDumpFunc *dump_cb,
  98                    BlockCompletionFunc *cb, void *opaque,
  99 +                  int pause_count,
 100                    Error **errp)
 101  {
 102      int64_t len;
 103
 104      assert(bs);
 105 -    assert(target);
 106 +    assert(target || dump_cb);
 107      assert(cb);
 108
 109      if (bs == target) {
 110 @@ -483,7 +501,7 @@ in backup_start
 111          return;
 112      }
 113
 114 -    if (!bdrv_is_inserted(target)) {
 115 +    if (target && !bdrv_is_inserted(target)) {
 116          error_setg(errp, "Device is not inserted: %s",
 117                     bdrv_get_device_name(target));
 118          return;
 119 @@ -493,7 +511,7 @@ in backup_start
 120          return;
 121      }
 122
 123 -    if (bdrv_op_is_blocked(target, BLOCK_OP_TYPE_BACKUP_TARGET, errp)) {
 124 +    if (target && bdrv_op_is_blocked(target, BLOCK_OP_TYPE_BACKUP_TARGET, errp)) {
 125          return;
 126      }
 127
 128 @@ -529,14 +547,17 @@ in backup_start
 129          goto error;
 130      }
 131
 132 -    bdrv_op_block_all(target, job->common.blocker);
 133 +    if (target)
 134 +        bdrv_op_block_all(target, job->common.blocker);
 135
 136 +    job->dump_cb = dump_cb;
 137      job->on_source_error = on_source_error;
 138      job->on_target_error = on_target_error;
 139      job->target = target;
 140      job->sync_mode = sync_mode;
 141      job->sync_bitmap = sync_mode == MIRROR_SYNC_MODE_INCREMENTAL ?
 142                         sync_bitmap : NULL;
 143 +    job->common.pause_count = pause_count;
 144      job->common.len = len;
 145      job->common.co = qemu_coroutine_create(backup_run);
 146      qemu_coroutine_enter(job->common.co, job);
 147 Index: new/blockdev.c
 148 ===================================================================
 149 --- new.orig/blockdev.c 2014-11-20 07:55:31.000000000 +0100
 150 +++ new/blockdev.c      2014-11-20 08:48:02.000000000 +0100
 151 @@ -2571,8 +2571,8 @@ qmp_drive_backup
 152      }
 153
 154      backup_start(bs, target_bs, speed, sync, bmap,
 155 -                 on_source_error, on_target_error,
 156 -                 block_job_cb, bs, &local_err);
 157 +                 on_source_error, on_target_error, NULL,
 158 +                 block_job_cb, bs, 0, &local_err);
 159      if (local_err != NULL) {
 160          bdrv_unref(target_bs);
 161          error_propagate(errp, local_err);
 162 @@ -2633,7 +2633,7 @@ qmp_blockdev_backup
 163      bdrv_ref(target_bs);
 164      bdrv_set_aio_context(target_bs, aio_context);
 165      backup_start(bs, target_bs, speed, sync, NULL, on_source_error,
 166 -                 on_target_error, block_job_cb, bs, &local_err);
 167 +                 on_target_error, NULL, block_job_cb, bs, 0, &local_err);
 168      if (local_err != NULL) {
 169          bdrv_unref(target_bs);
 170          error_propagate(errp, local_err);
 171 Index: new/include/block/block_int.h
 172 ===================================================================
 173 --- new.orig/include/block/block_int.h  2014-11-20 07:55:31.000000000 +0100
 174 +++ new/include/block/block_int.h       2014-11-20 08:52:59.000000000 +0100
 175 @@ -59,6 +59,9 @@
 176
 177  #define BLOCK_PROBE_BUF_SIZE        512
 178
 179 +typedef int BackupDumpFunc(void *opaque, BlockDriverState *bs,
 180 +                           int64_t sector_num, int n_sectors, unsigned char *buf);
 181 +
 182  typedef struct BdrvTrackedRequest {
 183      BlockDriverState *bs;
 184      int64_t offset;
 185 @@ -651,7 +654,9 @@
 186                    BdrvDirtyBitmap *sync_bitmap,
 187                    BlockdevOnError on_source_error,
 188                    BlockdevOnError on_target_error,
 189 +                  BackupDumpFunc *dump_cb,
 190                    BlockCompletionFunc *cb, void *opaque,
 191 +                  int pause_count,
 192                    Error **errp);
 193
 194  void blk_dev_change_media_cb(BlockBackend *blk, bool load);