From nobody Fri Dec 19 17:18:32 2025 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1700826764626582.9858182496204; Fri, 24 Nov 2023 03:52:44 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 8F8431975; Fri, 24 Nov 2023 06:52:43 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id F087019BC; Fri, 24 Nov 2023 06:35:20 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 5E237191A; Fri, 24 Nov 2023 06:33:59 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id C8D5618EF for ; Fri, 24 Nov 2023 06:33:33 -0500 (EST) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-179-5D7jRs0mND-RYvLbFOQqKw-1; Fri, 24 Nov 2023 06:33:32 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1CCFA1C041A7 for ; Fri, 24 Nov 2023 11:33:32 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.11]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9115F1121306 for ; Fri, 24 Nov 2023 11:33:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: 5D7jRs0mND-RYvLbFOQqKw-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 13/17] qemu: block: Absorb qemuBlockReopenFormatMon into qemuBlockReopenAccess Date: Fri, 24 Nov 2023 12:33:16 +0100 Message-ID: <7c12ab4ba2eb4349c566952c5514005f90e9829f.1700825268.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: IC5HVVDUWRQXE6OMSEIRTWNI6SHKMLI6 X-Message-ID-Hash: IC5HVVDUWRQXE6OMSEIRTWNI6SHKMLI6 X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1700826766356100001 Move all the code into the now only caller. Signed-off-by: Peter Krempa --- src/qemu/qemu_block.c | 31 +++++++++---------------------- src/qemu/qemu_block.h | 5 ----- 2 files changed, 9 insertions(+), 27 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 84d9ddd9ef..c62f8fe5f3 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -3155,26 +3155,6 @@ qemuBlockBitmapsHandleCommitFinish(virStorageSource = *topsrc, } -int -qemuBlockReopenFormatMon(qemuMonitor *mon, - virStorageSource *src) -{ - g_autoptr(virJSONValue) srcprops =3D NULL; - g_autoptr(virJSONValue) reopenoptions =3D virJSONValueNewArray(); - - if (!(srcprops =3D qemuBlockStorageSourceGetFormatProps(src, src->back= ingStore))) - return -1; - - if (virJSONValueArrayAppend(reopenoptions, &srcprops) < 0) - return -1; - - if (qemuMonitorBlockdevReopen(mon, &reopenoptions) < 0) - return -1; - - return 0; -} - - /** * qemuBlockReopenAccess: * @vm: domain object @@ -3193,7 +3173,8 @@ qemuBlockReopenAccess(virDomainObj *vm, bool readonly, virDomainAsyncJob asyncJob) { - qemuDomainObjPrivate *priv =3D vm->privateData; + g_autoptr(virJSONValue) reopenoptions =3D virJSONValueNewArray(); + g_autoptr(virJSONValue) srcprops =3D NULL; int rc; int ret =3D -1; @@ -3211,10 +3192,16 @@ qemuBlockReopenAccess(virDomainObj *vm, src->readonly =3D readonly; /* from now on all error paths must use 'goto cleanup' */ + if (!(srcprops =3D qemuBlockStorageSourceGetFormatProps(src, src->back= ingStore))) + return -1; + + if (virJSONValueArrayAppend(reopenoptions, &srcprops) < 0) + return -1; + if (qemuDomainObjEnterMonitorAsync(vm, asyncJob) < 0) goto cleanup; - rc =3D qemuBlockReopenFormatMon(priv->mon, src); + rc =3D qemuMonitorBlockdevReopen(qemuDomainGetMonitor(vm), &reopenopti= ons); qemuDomainObjExitMonitor(vm); if (rc < 0) diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h index dcd8a6ed6c..f37e10216c 100644 --- a/src/qemu/qemu_block.h +++ b/src/qemu/qemu_block.h @@ -263,11 +263,6 @@ qemuBlockBitmapsHandleCommitFinish(virStorageSource *t= opsrc, GHashTable *blockNamedNodeData, virJSONValue **actions); -/* only for use in qemumonitorjsontest */ -int -qemuBlockReopenFormatMon(qemuMonitor *mon, - virStorageSource *src); - int qemuBlockReopenReadWrite(virDomainObj *vm, virStorageSource *src, --=20 2.42.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org