From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6961AC3A59D for ; Fri, 16 Aug 2019 23:21:51 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 35494206C2 for ; Fri, 16 Aug 2019 23:21:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 35494206C2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hylXZ-0007ps-O8 for qemu-devel@archiver.kernel.org; Fri, 16 Aug 2019 19:21:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46127) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hylPa-0006EP-EI for qemu-devel@nongnu.org; Fri, 16 Aug 2019 19:13:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hylPY-0005jV-Qr for qemu-devel@nongnu.org; Fri, 16 Aug 2019 19:13:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43704) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hylPT-0005bz-Eq; Fri, 16 Aug 2019 19:13:29 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 727F7C049E1A; Fri, 16 Aug 2019 23:13:24 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-187.bos.redhat.com [10.18.17.187]) by smtp.corp.redhat.com (Postfix) with ESMTP id BFA5719C6A; Fri, 16 Aug 2019 23:13:23 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org Date: Fri, 16 Aug 2019 19:12:44 -0400 Message-Id: <20190816231318.8650-3-jsnow@redhat.com> In-Reply-To: <20190816231318.8650-1-jsnow@redhat.com> References: <20190816231318.8650-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 16 Aug 2019 23:13:24 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 02/36] drive-backup: create do_backup_common X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, jsnow@redhat.com, qemu-stable@nongnu.org, qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Create a common core that comprises the actual meat of what the backup AP= I boundary needs to do, and then switch drive-backup to use it. Signed-off-by: John Snow Reviewed-by: Max Reitz Message-id: 20190709232550.10724-3-jsnow@redhat.com Signed-off-by: John Snow --- blockdev.c | 122 +++++++++++++++++++++++++++++------------------------ 1 file changed, 67 insertions(+), 55 deletions(-) diff --git a/blockdev.c b/blockdev.c index 95cdd5a5cb0..d822b19b4b0 100644 --- a/blockdev.c +++ b/blockdev.c @@ -3427,6 +3427,70 @@ out: aio_context_release(aio_context); } =20 +/* Common QMP interface for drive-backup and blockdev-backup */ +static BlockJob *do_backup_common(BackupCommon *backup, + BlockDriverState *bs, + BlockDriverState *target_bs, + AioContext *aio_context, + JobTxn *txn, Error **errp) +{ + BlockJob *job =3D NULL; + BdrvDirtyBitmap *bmap =3D NULL; + int job_flags =3D JOB_DEFAULT; + int ret; + + if (!backup->has_speed) { + backup->speed =3D 0; + } + if (!backup->has_on_source_error) { + backup->on_source_error =3D BLOCKDEV_ON_ERROR_REPORT; + } + if (!backup->has_on_target_error) { + backup->on_target_error =3D BLOCKDEV_ON_ERROR_REPORT; + } + if (!backup->has_job_id) { + backup->job_id =3D NULL; + } + if (!backup->has_auto_finalize) { + backup->auto_finalize =3D true; + } + if (!backup->has_auto_dismiss) { + backup->auto_dismiss =3D true; + } + if (!backup->has_compress) { + backup->compress =3D false; + } + + ret =3D bdrv_try_set_aio_context(target_bs, aio_context, errp); + if (ret < 0) { + return NULL; + } + + if (backup->has_bitmap) { + bmap =3D bdrv_find_dirty_bitmap(bs, backup->bitmap); + if (!bmap) { + error_setg(errp, "Bitmap '%s' could not be found", backup->b= itmap); + return NULL; + } + if (bdrv_dirty_bitmap_check(bmap, BDRV_BITMAP_DEFAULT, errp)) { + return NULL; + } + } + + if (!backup->auto_finalize) { + job_flags |=3D JOB_MANUAL_FINALIZE; + } + if (!backup->auto_dismiss) { + job_flags |=3D JOB_MANUAL_DISMISS; + } + + job =3D backup_job_create(backup->job_id, bs, target_bs, backup->spe= ed, + backup->sync, bmap, backup->compress, + backup->on_source_error, backup->on_target_e= rror, + job_flags, NULL, NULL, txn, errp); + return job; +} + static BlockJob *do_drive_backup(DriveBackup *backup, JobTxn *txn, Error **errp) { @@ -3434,39 +3498,16 @@ static BlockJob *do_drive_backup(DriveBackup *bac= kup, JobTxn *txn, BlockDriverState *target_bs; BlockDriverState *source =3D NULL; BlockJob *job =3D NULL; - BdrvDirtyBitmap *bmap =3D NULL; AioContext *aio_context; QDict *options =3D NULL; Error *local_err =3D NULL; - int flags, job_flags =3D JOB_DEFAULT; + int flags; int64_t size; bool set_backing_hd =3D false; - int ret; =20 - if (!backup->has_speed) { - backup->speed =3D 0; - } - if (!backup->has_on_source_error) { - backup->on_source_error =3D BLOCKDEV_ON_ERROR_REPORT; - } - if (!backup->has_on_target_error) { - backup->on_target_error =3D BLOCKDEV_ON_ERROR_REPORT; - } if (!backup->has_mode) { backup->mode =3D NEW_IMAGE_MODE_ABSOLUTE_PATHS; } - if (!backup->has_job_id) { - backup->job_id =3D NULL; - } - if (!backup->has_auto_finalize) { - backup->auto_finalize =3D true; - } - if (!backup->has_auto_dismiss) { - backup->auto_dismiss =3D true; - } - if (!backup->has_compress) { - backup->compress =3D false; - } =20 bs =3D bdrv_lookup_bs(backup->device, backup->device, errp); if (!bs) { @@ -3543,12 +3584,6 @@ static BlockJob *do_drive_backup(DriveBackup *back= up, JobTxn *txn, goto out; } =20 - ret =3D bdrv_try_set_aio_context(target_bs, aio_context, errp); - if (ret < 0) { - bdrv_unref(target_bs); - goto out; - } - if (set_backing_hd) { bdrv_set_backing_hd(target_bs, source, &local_err); if (local_err) { @@ -3556,31 +3591,8 @@ static BlockJob *do_drive_backup(DriveBackup *back= up, JobTxn *txn, } } =20 - if (backup->has_bitmap) { - bmap =3D bdrv_find_dirty_bitmap(bs, backup->bitmap); - if (!bmap) { - error_setg(errp, "Bitmap '%s' could not be found", backup->b= itmap); - goto unref; - } - if (bdrv_dirty_bitmap_check(bmap, BDRV_BITMAP_DEFAULT, errp)) { - goto unref; - } - } - if (!backup->auto_finalize) { - job_flags |=3D JOB_MANUAL_FINALIZE; - } - if (!backup->auto_dismiss) { - job_flags |=3D JOB_MANUAL_DISMISS; - } - - job =3D backup_job_create(backup->job_id, bs, target_bs, backup->spe= ed, - backup->sync, bmap, backup->compress, - backup->on_source_error, backup->on_target_e= rror, - job_flags, NULL, NULL, txn, &local_err); - if (local_err !=3D NULL) { - error_propagate(errp, local_err); - goto unref; - } + job =3D do_backup_common(qapi_DriveBackup_base(backup), + bs, target_bs, aio_context, txn, errp); =20 unref: bdrv_unref(target_bs); --=20 2.21.0