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=-7.0 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 08CF2C5B578 for ; Wed, 3 Jul 2019 22:06:39 +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 D2CF1218A3 for ; Wed, 3 Jul 2019 22:06:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D2CF1218A3 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]:41234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hinOg-0008EN-2z for qemu-devel@archiver.kernel.org; Wed, 03 Jul 2019 18:06:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45971) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hinES-0005CA-Fn for qemu-devel@nongnu.org; Wed, 03 Jul 2019 17:56:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hinER-0003kQ-5x for qemu-devel@nongnu.org; Wed, 03 Jul 2019 17:56:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48014) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hinEO-0003hR-P3; Wed, 03 Jul 2019 17:56:00 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 15789307D88C; Wed, 3 Jul 2019 21:56:00 +0000 (UTC) Received: from probe.redhat.com (ovpn-123-117.rdu2.redhat.com [10.10.123.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B7A15235E; Wed, 3 Jul 2019 21:55:57 +0000 (UTC) From: John Snow To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Wed, 3 Jul 2019 17:55:27 -0400 Message-Id: <20190703215542.16123-4-jsnow@redhat.com> In-Reply-To: <20190703215542.16123-1-jsnow@redhat.com> References: <20190703215542.16123-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Wed, 03 Jul 2019 21:56:00 +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] [PATCH v2 03/18] blockdev-backup: utilize 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: Kevin Wolf , Fam Zheng , vsementsov@virtuozzo.com, Juan Quintela , John Snow , Xie Changlong , Markus Armbruster , "Dr. David Alan Gilbert" , Stefan Hajnoczi , Wen Congyang , Max Reitz Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: John Snow --- blockdev.c | 73 +++--------------------------------------------------- 1 file changed, 3 insertions(+), 70 deletions(-) diff --git a/blockdev.c b/blockdev.c index 5fd663a7e5..cad300d526 100644 --- a/blockdev.c +++ b/blockdev.c @@ -3638,82 +3638,15 @@ XDbgBlockGraph *qmp_x_debug_query_block_graph(Err= or **errp) BlockJob *do_blockdev_backup(BlockdevBackup *backup, JobTxn *txn, Error **errp) { - BlockDriverState *bs; BlockDriverState *target_bs; - Error *local_err =3D NULL; - BdrvDirtyBitmap *bmap =3D NULL; - AioContext *aio_context; - BlockJob *job =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; - } - - bs =3D bdrv_lookup_bs(backup->device, backup->device, errp); - if (!bs) { - return NULL; - } - - aio_context =3D bdrv_get_aio_context(bs); - aio_context_acquire(aio_context); =20 target_bs =3D bdrv_lookup_bs(backup->target, backup->target, errp); if (!target_bs) { - goto out; + return NULL; } =20 - ret =3D bdrv_try_set_aio_context(target_bs, aio_context, errp); - if (ret < 0) { - goto out; - } - - 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 out; - } - if (bdrv_dirty_bitmap_check(bmap, BDRV_BITMAP_DEFAULT, errp)) { - goto out; - } - } - - 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); - } -out: - aio_context_release(aio_context); - return job; + return do_backup_common(qapi_BlockdevBackup_base(backup), + target_bs, txn, errp); } =20 void qmp_blockdev_backup(BlockdevBackup *arg, Error **errp) --=20 2.21.0