[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v4 03/18] blockdev-backup: utilize do_backup_common
From: |
John Snow |
Subject: |
[Qemu-block] [PATCH v4 03/18] blockdev-backup: utilize do_backup_common |
Date: |
Tue, 9 Jul 2019 19:25:35 -0400 |
Signed-off-by: John Snow <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
blockdev.c | 65 +++++-------------------------------------------------
1 file changed, 6 insertions(+), 59 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 5bc8ecd087..77365d8166 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -3624,78 +3624,25 @@ BlockJob *do_blockdev_backup(BlockdevBackup *backup,
JobTxn *txn,
{
BlockDriverState *bs;
BlockDriverState *target_bs;
- Error *local_err = NULL;
- BdrvDirtyBitmap *bmap = NULL;
AioContext *aio_context;
- BlockJob *job = NULL;
- int job_flags = JOB_DEFAULT;
- int ret;
-
- if (!backup->has_speed) {
- backup->speed = 0;
- }
- if (!backup->has_on_source_error) {
- backup->on_source_error = BLOCKDEV_ON_ERROR_REPORT;
- }
- if (!backup->has_on_target_error) {
- backup->on_target_error = BLOCKDEV_ON_ERROR_REPORT;
- }
- if (!backup->has_job_id) {
- backup->job_id = NULL;
- }
- if (!backup->has_auto_finalize) {
- backup->auto_finalize = true;
- }
- if (!backup->has_auto_dismiss) {
- backup->auto_dismiss = true;
- }
- if (!backup->has_compress) {
- backup->compress = false;
- }
+ BlockJob *job;
bs = bdrv_lookup_bs(backup->device, backup->device, errp);
if (!bs) {
return NULL;
}
- aio_context = bdrv_get_aio_context(bs);
- aio_context_acquire(aio_context);
-
target_bs = bdrv_lookup_bs(backup->target, backup->target, errp);
if (!target_bs) {
- goto out;
+ return NULL;
}
- ret = bdrv_try_set_aio_context(target_bs, aio_context, errp);
- if (ret < 0) {
- goto out;
- }
+ aio_context = bdrv_get_aio_context(bs);
+ aio_context_acquire(aio_context);
- if (backup->has_bitmap) {
- bmap = bdrv_find_dirty_bitmap(bs, backup->bitmap);
- if (!bmap) {
- error_setg(errp, "Bitmap '%s' could not be found", backup->bitmap);
- goto out;
- }
- if (bdrv_dirty_bitmap_check(bmap, BDRV_BITMAP_DEFAULT, errp)) {
- goto out;
- }
- }
+ job = do_backup_common(qapi_BlockdevBackup_base(backup),
+ bs, target_bs, aio_context, txn, errp);
- if (!backup->auto_finalize) {
- job_flags |= JOB_MANUAL_FINALIZE;
- }
- if (!backup->auto_dismiss) {
- job_flags |= JOB_MANUAL_DISMISS;
- }
- job = backup_job_create(backup->job_id, bs, target_bs, backup->speed,
- backup->sync, bmap, backup->compress,
- backup->on_source_error, backup->on_target_error,
- job_flags, NULL, NULL, txn, &local_err);
- if (local_err != NULL) {
- error_propagate(errp, local_err);
- }
-out:
aio_context_release(aio_context);
return job;
}
--
2.21.0
- [Qemu-block] [PATCH v4 00/18] bitmaps: introduce 'bitmap' sync mode, John Snow, 2019/07/09
- [Qemu-block] [PATCH v4 07/18] hbitmap: Fix merge when b is empty, and result is not an alias of a, John Snow, 2019/07/09
- [Qemu-block] [PATCH v4 08/18] hbitmap: enable merging across granularities, John Snow, 2019/07/09
- [Qemu-block] [PATCH v4 11/18] block/backup: upgrade copy_bitmap to BdrvDirtyBitmap, John Snow, 2019/07/09
- [Qemu-block] [PATCH v4 06/18] block/backup: add 'never' policy to bitmap sync mode, John Snow, 2019/07/09
- [Qemu-block] [PATCH v4 05/18] block/backup: Add mirror sync mode 'bitmap', John Snow, 2019/07/09
- [Qemu-block] [PATCH v4 03/18] blockdev-backup: utilize do_backup_common,
John Snow <=
- [Qemu-block] [PATCH v4 04/18] qapi: add BitmapSyncMode enum, John Snow, 2019/07/09
- [Qemu-block] [PATCH v4 01/18] qapi/block-core: Introduce BackupCommon, John Snow, 2019/07/09
- [Qemu-block] [PATCH v4 10/18] block/dirty-bitmap: add bdrv_dirty_bitmap_get, John Snow, 2019/07/09
- [Qemu-block] [PATCH v4 14/18] iotests: teach run_job to cancel pending jobs, John Snow, 2019/07/09
- [Qemu-block] [PATCH v4 16/18] iotests: Add virtio-scsi device helper, John Snow, 2019/07/09
- [Qemu-block] [PATCH v4 15/18] iotests: teach FilePath to produce multiple paths, John Snow, 2019/07/09
- [Qemu-block] [PATCH v4 02/18] drive-backup: create do_backup_common, John Snow, 2019/07/09