From nobody Fri Dec 27 11:20:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) 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 1732634379682189.93782956624113; Tue, 26 Nov 2024 07:19:39 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 14E8817E9; Tue, 26 Nov 2024 10:19:39 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 7FBA11C54; Tue, 26 Nov 2024 10:17:24 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id B064F18B9; Tue, 26 Nov 2024 10:17:19 -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 C4BE11C29 for ; Tue, 26 Nov 2024 10:16:57 -0500 (EST) Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-613-cZnKU7a4MqKnyV0LpwuWyA-1; Tue, 26 Nov 2024 10:16:55 -0500 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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 mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B26D91877A7B for ; Tue, 26 Nov 2024 15:16:31 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.6]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A2214196BC05 for ; Tue, 26 Nov 2024 15:16:30 +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=-1.7 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732634217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2eHMMzkxnmS3FDyIFwEX9eyz0CYSlPywpZYCqGHdcLQ=; b=b8/o3JgT10jSe/sSmc2M8OUgXenMtpmycDe8CbQz5Sd0noU269c6heoycNGDmGgb5GlOAo WUzDp1ZAhsT8A8sUvWnjY0J2dV7+1NLWMcq7H0TeA3aTrxi72nawIhDW9Xqlrvd7suachB wqeYy1pegdw6T1OEUD34xS3OxFcUt0w= X-MC-Unique: cZnKU7a4MqKnyV0LpwuWyA-1 X-Mimecast-MFC-AGG-ID: cZnKU7a4MqKnyV0LpwuWyA From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 6/8] qemuDomainVirStorageSourceFindByNodeName: Extract nodename matching Date: Tue, 26 Nov 2024 16:16:17 +0100 Message-ID: <0560a24ab6dca627530ec8130f3266d202ca8869.1732633990.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: dDkcQbZijwJIXyU5agAPuNhhZ6NRO-SWZkWua0KX7h0_1732634215 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: E77AMD5M6CWGV26UNTYA5OF6O5ZS2MOY X-Message-ID-Hash: E77AMD5M6CWGV26UNTYA5OF6O5ZS2MOY 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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1732634380383019100 Content-Type: text/plain; charset="utf-8" Extract the matching of the node name of a single virStorage source so that the logic can be extended in the upcoming patch. Signed-off-by: Peter Krempa --- src/qemu/qemu_domain.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d28ff0cd22..150f0736f3 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2884,6 +2884,25 @@ qemuDomainObjPrivateXMLParseBlockjobChain(xmlNodePtr= node, } +/** + * qemuDomainVirStorageSourceMatchNodename: + * @src: storage source to match + * @nodeName to match + * + * Returns true if any of the nodenames of @src matches @nodeName. + */ +static bool +qemuDomainVirStorageSourceMatchNodename(virStorageSource *src, + const char *nodeName) +{ + const char *nodestorage =3D qemuBlockStorageSourceGetStorageNodename(s= rc); + const char *nodeformat =3D qemuBlockStorageSourceGetFormatNodename(src= ); + + return (nodeformat && STREQ(nodeformat, nodeName)) || + (nodestorage && STREQ(nodestorage, nodeName)); +} + + /** * qemuDomainVirStorageSourceFindByNodeName: * @top: backing chain top @@ -2900,11 +2919,7 @@ qemuDomainVirStorageSourceFindByNodeName(virStorageS= ource *top, virStorageSource *tmp; for (tmp =3D top; virStorageSourceIsBacking(tmp); tmp =3D tmp->backing= Store) { - const char *nodestorage =3D qemuBlockStorageSourceGetStorageNodena= me(tmp); - const char *nodeformat =3D qemuBlockStorageSourceGetFormatNodename= (tmp); - - if ((nodeformat && STREQ(nodeformat, nodeName)) || - (nodestorage && STREQ(nodestorage, nodeName))) + if (qemuDomainVirStorageSourceMatchNodename(tmp, nodeName)) return tmp; } --=20 2.47.0