From nobody Wed Nov 19 08:44:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1615317597; cv=none; d=zohomail.com; s=zohoarc; b=h6Rw94tIaBNZxkP/4ghysOSTGO9iRBRzHTy+2LcuYwpOsoojU0hPP5BBwE9yfsQqvyzgftDiJOVmyvD4Okrjoceb1rlrav4G3nKK+eE0VmCUUY/NcsDCBRImmZmB8D3b3I8XiBMBB6nkNyfc9Qvz8jc0EArVQHS7tAmL1fcmrHM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615317597; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cSppux1HTzoJTwnXt6L+1M1jkJgYs///JT3/jjsN6pU=; b=cbAijEfNbJKLrHPWDyO4HEXCWnCTMDNOIveVIHI7MIpVjKBFmUj2HRIc33bFQ6Bu1vyHuTlVwL2eFimDj8VQ2AdaXyw27HeV8AHnVR8TZ0uWSfvM7nGxeLkcvVO2+b3kzo+DqAFeLyxEgZbuxszNRRsDsYGueqZy/V7fd0DqtHc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615317597666865.569599992445; Tue, 9 Mar 2021 11:19:57 -0800 (PST) Received: from localhost ([::1]:53724 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJhta-0004zd-Hy for importer@patchew.org; Tue, 09 Mar 2021 14:19:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59742) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJfrN-0001HH-TM; Tue, 09 Mar 2021 12:09:30 -0500 Received: from fanzine.igalia.com ([178.60.130.6]:40106) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJfrC-0001DN-8v; Tue, 09 Mar 2021 12:09:29 -0500 Received: from [213.94.25.37] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1lJfqn-0003Lq-S6; Tue, 09 Mar 2021 18:08:53 +0100 Received: from berto by perseus.local with local (Exim 4.92) (envelope-from ) id 1lJfqa-0005IT-Ju; Tue, 09 Mar 2021 18:08:40 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=cSppux1HTzoJTwnXt6L+1M1jkJgYs///JT3/jjsN6pU=; b=J952r+oeRcrId7/WfEgzmkLaHlM3K5rvY4I5Odk+k4/Q/wZ0Sfos2yhx/1FqCTW5kiWTdbuzSqbSJjlcPowG6X4/Mk8yaSKPTPKe22D8uUz/YLbwuBIg07QFW69Cf+LnpW28wYt7tNppxaGnQuKZfk7byHSnRtpLQ/G5sHQHUJZvxqLHOVGm4DayVBGPUZVjg0vWvUSumPXvhdLwuwMaj8z0Vve3BNr6/IyaHPCDNET9BbnLabZmr80rd5zaXj2GJWmZCETnGJ2HmaNItP55Ho8QwvHK7A0aZ7DN7TvLTC886m+pVzrEZbncpQL/zzv81PZvTR0KQ3LUpkyLmLE1OA==; From: Alberto Garcia To: qemu-devel@nongnu.org Subject: [PATCH v3 1/6] block: Add bdrv_reopen_queue_free() Date: Tue, 9 Mar 2021 18:08:27 +0100 Message-Id: <7dfe215838c2afbf44513ed32bea5a2cb6ffb472.1615309297.git.berto@igalia.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=178.60.130.6; envelope-from=berto@igalia.com; helo=fanzine.igalia.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 , Vladimir Sementsov-Ogievskiy , Alberto Garcia , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Move the code to free a BlockReopenQueue to a separate function. It will be used in a subsequent patch. Signed-off-by: Alberto Garcia --- include/block/block.h | 1 + block.c | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/include/block/block.h b/include/block/block.h index 82271d9ccd..aa3d568fec 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -371,6 +371,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); +void bdrv_reopen_queue_free(BlockReopenQueue *bs_queue); int bdrv_reopen_multiple(BlockReopenQueue *bs_queue, Error **errp); int bdrv_reopen_set_read_only(BlockDriverState *bs, bool read_only, Error **errp); diff --git a/block.c b/block.c index 576b145cbf..03b36cd5df 100644 --- a/block.c +++ b/block.c @@ -3933,6 +3933,17 @@ BlockReopenQueue *bdrv_reopen_queue(BlockReopenQueue= *bs_queue, NULL, 0, keep_old_opts); } =20 +void bdrv_reopen_queue_free(BlockReopenQueue *bs_queue) +{ + if (bs_queue) { + BlockReopenQueueEntry *bs_entry, *next; + QTAILQ_FOREACH_SAFE(bs_entry, bs_queue, entry, next) { + g_free(bs_entry); + } + g_free(bs_queue); + } +} + /* * Reopen multiple BlockDriverStates atomically & transactionally. * @@ -4020,10 +4031,7 @@ abort: } =20 cleanup: - QTAILQ_FOREACH_SAFE(bs_entry, bs_queue, entry, next) { - g_free(bs_entry); - } - g_free(bs_queue); + bdrv_reopen_queue_free(bs_queue); =20 return ret; } --=20 2.20.1