From 9ceb049d554fc60cf88b4338828c1ef0a0013db6 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Mon, 13 Jul 2015 15:39:47 +0200 Subject: [PATCH] adapt to nested-pause change: 751ebd76e6 --- debian/patches/backup-add-dir-format.patch | 2 +- debian/patches/backup-add-pve-monitor-commands.patch | 2 +- debian/patches/backup-modify-job-api.patch | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/patches/backup-add-dir-format.patch b/debian/patches/backup-add-dir-format.patch index 648ef35..0d32af5 100644 --- a/debian/patches/backup-add-dir-format.patch +++ b/debian/patches/backup-add-dir-format.patch @@ -187,7 +187,7 @@ Index: new/blockdev.c + backup_start(di->bs, di->target, speed, MIRROR_SYNC_MODE_FULL, NULL, BLOCKDEV_ON_ERROR_REPORT, BLOCKDEV_ON_ERROR_REPORT, pvebackup_dump_cb, pvebackup_complete_cb, di, - true, &local_err); + 1, &local_err); + if (local_err != NULL) { error_setg(&backup_state.error, "backup_job_create failed"); diff --git a/debian/patches/backup-add-pve-monitor-commands.patch b/debian/patches/backup-add-pve-monitor-commands.patch index cdf1f54..2b45b2c 100644 --- a/debian/patches/backup-add-pve-monitor-commands.patch +++ b/debian/patches/backup-add-pve-monitor-commands.patch @@ -369,7 +369,7 @@ Index: new/blockdev.c + backup_start(di->bs, NULL, speed, MIRROR_SYNC_MODE_FULL, NULL, + BLOCKDEV_ON_ERROR_REPORT, BLOCKDEV_ON_ERROR_REPORT, + pvebackup_dump_cb, pvebackup_complete_cb, di, -+ true, &local_err); ++ 1, &local_err); + if (local_err != NULL) { + error_setg(&backup_state.error, "backup_job_create failed"); + pvebackup_cancel(NULL); diff --git a/debian/patches/backup-modify-job-api.patch b/debian/patches/backup-modify-job-api.patch index 62c9420..2f330e2 100644 --- a/debian/patches/backup-modify-job-api.patch +++ b/debian/patches/backup-modify-job-api.patch @@ -96,7 +96,7 @@ Index: new/block/backup.c BlockdevOnError on_target_error, + BackupDumpFunc *dump_cb, BlockCompletionFunc *cb, void *opaque, -+ bool paused, ++ int pause_count, Error **errp) { int64_t len; @@ -140,7 +140,7 @@ Index: new/block/backup.c job->sync_mode = sync_mode; job->sync_bitmap = sync_mode == MIRROR_SYNC_MODE_INCREMENTAL ? sync_bitmap : NULL; -+ job->common.paused = paused; ++ job->common.pause_count = pause_count; job->common.len = len; job->common.co = qemu_coroutine_create(backup_run); qemu_coroutine_enter(job->common.co, job); @@ -155,7 +155,7 @@ Index: new/blockdev.c - on_source_error, on_target_error, - block_job_cb, bs, &local_err); + on_source_error, on_target_error, NULL, -+ block_job_cb, bs, false, &local_err); ++ block_job_cb, bs, 0, &local_err); if (local_err != NULL) { bdrv_unref(target_bs); error_propagate(errp, local_err); @@ -164,7 +164,7 @@ Index: new/blockdev.c bdrv_set_aio_context(target_bs, aio_context); backup_start(bs, target_bs, speed, sync, NULL, on_source_error, - on_target_error, block_job_cb, bs, &local_err); -+ on_target_error, NULL, block_job_cb, bs, false, &local_err); ++ on_target_error, NULL, block_job_cb, bs, 0, &local_err); if (local_err != NULL) { bdrv_unref(target_bs); error_propagate(errp, local_err); @@ -188,7 +188,7 @@ Index: new/include/block/block_int.h BlockdevOnError on_target_error, + BackupDumpFunc *dump_cb, BlockCompletionFunc *cb, void *opaque, -+ bool paused, ++ int pause_count, Error **errp); void blk_dev_change_media_cb(BlockBackend *blk, bool load); -- 2.39.2