From nobody Tue Mar 24 01:20:11 2026 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=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1773764101; cv=none; d=zohomail.com; s=zohoarc; b=Z1HGkviUfoTWVfaJVoh1Tn925ZekRzsaXH00boNu8HWy2qwK33B5rsdUfg4PsWiymcNIUo6xYaBN4iD/uWvi/ohfNA31oGZBnd0KY5SXU3Y9agjNnBYpMsJtNTdY0dLLEZkGlpM0swnDERgsGEluFT8WPG1ak5dWbK2boRlqsvM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773764101; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=HMMs3LazsY78zsGLOBKt5Akp8e776KjfLEeRwsuaqhQ=; b=CAaUeM1t3m0KBQG35H9ZurlElEgLDAlGxdaAPi33N/hWWu3pW0jj0F/ssIWjXzIdMuvIoS2V8TXQeD9tnbtH8kQVN/jW2wZwM21oOts8wMlGsFaaGLDfoHVYxAuIMZUKQlfWF49zOmdCKjJpCed8u4d3p7PwcZW6Yzqpmhx57u0= ARC-Authentication-Results: i=1; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1773764101699474.1640935389746; Tue, 17 Mar 2026 09:15:01 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 45A07417DA; Tue, 17 Mar 2026 12:15:02 -0400 (EDT) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id CA62A41BAD; Tue, 17 Mar 2026 12:10:23 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id BF7F941B04; Tue, 17 Mar 2026 12:10:18 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 987F5417D3 for ; Tue, 17 Mar 2026 12:10:14 -0400 (EDT) Received: from mx-prod-mc-05.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-695-ATHwCwgYOsCmpgSbWo2UZQ-1; Tue, 17 Mar 2026 12:10:12 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CFE55195609E for ; Tue, 17 Mar 2026 16:10:11 +0000 (UTC) Received: from moe (unknown [10.43.3.236]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3818D1955F19 for ; Tue, 17 Mar 2026 16:10:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773763814; 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=HMMs3LazsY78zsGLOBKt5Akp8e776KjfLEeRwsuaqhQ=; b=I9KyfPBc+BuGREFNkXzIFWpejtwYoidMvDC1vdKFpwMTQDqCb2EyBtlhYtIDYmRUnVUC9E fETKxvujjWBy5QmURPNSFnb0iv2zuRErePevo3mLkxOytphMeliphmn1Q6DjYUpOVP2+c2 40MsfNHSJuCNhZSN4GVSKYZfQBx6RsE= X-MC-Unique: ATHwCwgYOsCmpgSbWo2UZQ-1 X-Mimecast-MFC-AGG-ID: ATHwCwgYOsCmpgSbWo2UZQ_1773763811 To: devel@lists.libvirt.org Subject: [PATCH 3/3] networkxmlconftest: s/fail/cleanup/ Date: Tue, 17 Mar 2026 17:10:05 +0100 Message-ID: <634fbaee1725aec12bc7c4ac21a752bf6474cf39.1773763761.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: RiT49lSibIp0Pr8CY33oWCi1mbwAEsXIK34-m3gaq3o_1773763811 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: HSQED6W6EQP2SPBX25YYAN6CW7FNUGA5 X-Message-ID-Hash: HSQED6W6EQP2SPBX25YYAN6CW7FNUGA5 X-MailFrom: mprivozn@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Michal Privoznik via Devel Reply-To: Michal Privoznik X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1773764132795158500 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik Inside of testCompareXMLtoXMLFiles() the 'fail' label is used in both successful and error runs. If that's the case, our coding standard mandates the label to be named 'cleanup'. Change it. Signed-off-by: Michal Privoznik --- tests/networkxmlconftest.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/networkxmlconftest.c b/tests/networkxmlconftest.c index b74d5b14f5..7f98004c75 100644 --- a/tests/networkxmlconftest.c +++ b/tests/networkxmlconftest.c @@ -125,16 +125,16 @@ testCompareXMLToConfFiles(const void *data) bool compareFailed =3D false; =20 if (!(obj =3D virNetworkObjNew())) - goto fail; + goto cleanup; =20 if (!(def =3D g_steal_pointer(&info->def))) { /* Previous test wasn't executed. */ if (!(def =3D virNetworkDefParse(NULL, info->inxml, info->xmlopt, = false))) - goto fail; + goto cleanup; =20 if (networkValidateTests(def) < 0) { virNetworkDefFree(def); - goto fail; + goto cleanup; } } =20 @@ -142,17 +142,17 @@ testCompareXMLToConfFiles(const void *data) =20 if (!networkNeedsDnsmasq(def)) { ret =3D EXIT_AM_SKIP; - goto fail; + goto cleanup; } =20 dctx =3D dnsmasqContextNew(def->name, "/var/lib/libvirt/dnsmasq"); =20 if (dctx =3D=3D NULL) - goto fail; + goto cleanup; =20 if (networkDnsmasqConfContents(obj, pidfile, &confactual, &hostsfileactual, dctx, info->caps) < 0) - goto fail; + goto cleanup; =20 /* Any changes to this function ^^ should be reflected here too. */ #ifndef __linux__ @@ -162,7 +162,7 @@ testCompareXMLToConfFiles(const void *data) if (!(tmp =3D virStringReplace(confactual, "except-interface=3Dlo0\n", "except-interface=3Dlo\n"))) - goto fail; + goto cleanup; VIR_FREE(confactual); confactual =3D g_steal_pointer(&tmp); } @@ -184,11 +184,11 @@ testCompareXMLToConfFiles(const void *data) } =20 if (compareFailed) - goto fail; + goto cleanup; =20 ret =3D 0; =20 - fail: + cleanup: VIR_FREE(confactual); virNetworkObjEndAPI(&obj); return ret; --=20 2.52.0