From nobody Thu Dec 18 19:30:39 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552414903855690.0719431040952; Tue, 12 Mar 2019 11:21:43 -0700 (PDT) Received: from localhost ([127.0.0.1]:57305 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3m20-00031M-PF for importer@patchew.org; Tue, 12 Mar 2019 14:21:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57027) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3lFC-0001P0-Fa for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:31:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3lFB-0000Tp-64 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:31:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38764) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h3lF7-0000OY-Co; Tue, 12 Mar 2019 13:31:09 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 79F3A30861FB; Tue, 12 Mar 2019 17:31:08 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-117-52.ams2.redhat.com [10.36.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6AF1360BF7; Tue, 12 Mar 2019 17:31:07 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Tue, 12 Mar 2019 18:30:23 +0100 Message-Id: <20190312173025.3843-27-kwolf@redhat.com> In-Reply-To: <20190312173025.3843-1-kwolf@redhat.com> References: <20190312173025.3843-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Tue, 12 Mar 2019 17:31:08 +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 26/28] block: Remove the AioContext parameter from bdrv_reopen_multiple() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Alberto Garcia This parameter has been unused since 1a63a907507fbbcfaee3f622907ec244b Signed-off-by: Alberto Garcia Signed-off-by: Kevin Wolf --- include/block/block.h | 2 +- block.c | 4 ++-- block/replication.c | 3 +-- qemu-io-cmds.c | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/block/block.h b/include/block/block.h index 68a3efbb43..e452988b66 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -304,7 +304,7 @@ BlockDriverState *bdrv_new_open_driver(BlockDriver *drv= , const char *node_name, BlockReopenQueue *bdrv_reopen_queue(BlockReopenQueue *bs_queue, BlockDriverState *bs, QDict *options, bool keep_old_opts); -int bdrv_reopen_multiple(AioContext *ctx, BlockReopenQueue *bs_queue, Erro= r **errp); +int bdrv_reopen_multiple(BlockReopenQueue *bs_queue, Error **errp); int bdrv_reopen_set_read_only(BlockDriverState *bs, bool read_only, Error **errp); int bdrv_reopen_prepare(BDRVReopenState *reopen_state, diff --git a/block.c b/block.c index a5e69ad81e..ed9253c786 100644 --- a/block.c +++ b/block.c @@ -3254,7 +3254,7 @@ BlockReopenQueue *bdrv_reopen_queue(BlockReopenQueue = *bs_queue, * All affected nodes must be drained between bdrv_reopen_queue() and * bdrv_reopen_multiple(). */ -int bdrv_reopen_multiple(AioContext *ctx, BlockReopenQueue *bs_queue, Erro= r **errp) +int bdrv_reopen_multiple(BlockReopenQueue *bs_queue, Error **errp) { int ret =3D -1; BlockReopenQueueEntry *bs_entry, *next; @@ -3347,7 +3347,7 @@ int bdrv_reopen_set_read_only(BlockDriverState *bs, b= ool read_only, =20 bdrv_subtree_drained_begin(bs); queue =3D bdrv_reopen_queue(NULL, bs, opts, true); - ret =3D bdrv_reopen_multiple(bdrv_get_aio_context(bs), queue, errp); + ret =3D bdrv_reopen_multiple(queue, errp); bdrv_subtree_drained_end(bs); =20 return ret; diff --git a/block/replication.c b/block/replication.c index a2f3590310..b95bd28802 100644 --- a/block/replication.c +++ b/block/replication.c @@ -385,8 +385,7 @@ static void reopen_backing_file(BlockDriverState *bs, b= ool writable, } =20 if (reopen_queue) { - bdrv_reopen_multiple(bdrv_get_aio_context(bs), - reopen_queue, &local_err); + bdrv_reopen_multiple(reopen_queue, &local_err); error_propagate(errp, local_err); } =20 diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c index ff9a5cd80f..35dcdcf413 100644 --- a/qemu-io-cmds.c +++ b/qemu-io-cmds.c @@ -2081,7 +2081,7 @@ static int reopen_f(BlockBackend *blk, int argc, char= **argv) =20 bdrv_subtree_drained_begin(bs); brq =3D bdrv_reopen_queue(NULL, bs, opts, true); - bdrv_reopen_multiple(bdrv_get_aio_context(bs), brq, &local_err); + bdrv_reopen_multiple(brq, &local_err); bdrv_subtree_drained_end(bs); =20 if (local_err) { --=20 2.20.1