From nobody Sun Feb 8 19:24:57 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1638282814; cv=none; d=zohomail.com; s=zohoarc; b=V01BIYY1tg7w8RaVQZ8Q3sWT4qlJYhp9Cg09IbDYY6InHbnol5Dm6snzB6P4876+a/zxufDhcFUAYqEnomYZdr2q5GhLzv49KB5mt7b+k2Y7ZLeucUkC9skhVmecGIobfkv5mS3C7LKEElBxC62k20e2NTRlchfNqPGUc50QklI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1638282814; h=Content-Type:Content-Transfer-Encoding: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=mgRgvKp2f3a2yYeQEoIwpjdMpXH17r+IKP4I5tagfMw=; b=bz8wxthFRMUUHKCc4q6w8eUYIFUCWkVIMYTabtjZurSX/N75htZ0lvzFnZA07PSRZElBOEh24IhL2nzQrvoBNk+NVeg4G3gaTWqoZ7jkSizc3zWV3l9Vj/7uEoBRcwygl4rui8nW/TBn3y90dm9YF1gE4MLmEZoqqMk5iNkvF18= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1638282814916571.3125491514292; Tue, 30 Nov 2021 06:33:34 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-190-3NZsFFC4M3u6dP4OLD22Tg-1; Tue, 30 Nov 2021 09:33:32 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8559083DAA4; Tue, 30 Nov 2021 14:33:21 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 67953100EBAD; Tue, 30 Nov 2021 14:33:21 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 27D7D1806D2B; Tue, 30 Nov 2021 14:33:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1AUEXJZp022882 for ; Tue, 30 Nov 2021 09:33:19 -0500 Received: by smtp.corp.redhat.com (Postfix) id D6EAA78C19; Tue, 30 Nov 2021 14:33:19 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2556160CA1 for ; Tue, 30 Nov 2021 14:33:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1638282813; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=mgRgvKp2f3a2yYeQEoIwpjdMpXH17r+IKP4I5tagfMw=; b=ZWnPFp2WkoQFQb1gw1yze7yiV0/rSkzVjjQcKKfatYQz7T25gKwbQ0mChgeZVTbSfJPAbI xt58BoxgqOiCxw8wlhGID1ivSwrhCzEQXW5h48BhJoInCb/KwlHyrWailZ11RWW5ZlNLx3 LRv30kF68D+fCkwCxvrXGM6IhFqUOa8= X-MC-Unique: 3NZsFFC4M3u6dP4OLD22Tg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 18/23] qemumonitorjsontest: testBlockNodeNameDetect: Automatically free GHashTable Date: Tue, 30 Nov 2021 15:32:02 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1638282815723100003 Content-Type: text/plain; charset="utf-8" Additionally we no longer need the cleanup section. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/qemumonitorjsontest.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index bcf5caa9a4..91a9193f2a 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -2490,24 +2490,23 @@ testBlockNodeNameDetect(const void *opaque) g_autofree char *actual =3D NULL; g_autoptr(virJSONValue) namedNodesJson =3D NULL; g_autoptr(virJSONValue) blockstatsJson =3D NULL; - GHashTable *nodedata =3D NULL; + g_autoptr(GHashTable) nodedata =3D NULL; g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - int ret =3D -1; resultFile =3D g_strdup_printf("%s/%s%s.result", abs_srcdir, pathprefi= x, testname); if (!(namedNodesJson =3D virTestLoadFileJSON(pathprefix, testname, "-named-nodes.json", NULL))) - goto cleanup; + return -1; if (!(blockstatsJson =3D virTestLoadFileJSON(pathprefix, testname, "-blockstats.json", NULL))) - goto cleanup; + return -1; if (!(nodedata =3D qemuBlockNodeNameGetBackingChain(namedNodesJson, blockstatsJson))) - goto cleanup; + return -1; virHashForEachSorted(nodedata, testBlockNodeNameDetectFormat, &buf); @@ -2516,14 +2515,9 @@ testBlockNodeNameDetect(const void *opaque) actual =3D virBufferContentAndReset(&buf); if (virTestCompareToFile(actual, resultFile) < 0) - goto cleanup; - - ret =3D 0; - - cleanup: - virHashFree(nodedata); + return -1; - return ret; + return 0; } --=20 2.31.1