From nobody Mon Apr 29 11:21:13 2024 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=1629470966; cv=none; d=zohomail.com; s=zohoarc; b=CscF53wPYVT3m+6YRZ4LL29kYTjvHT2xKLsUHZXhAJrtevJq2nm2Mt7B4NJubx/98x4lg6JvIpRbabk/zE1WajnSnweHm5kRjmI8SEe2qVf/K8wR0Mtm0ABDaPhtM8CyQINgq55jds0G/aetNHwI3+7FoXLb5C0sSyTCW0zdlTI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629470966; 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=A31efrhF4oJqGaXPOlzuT58f4jVVOSnNYetyxd6Ljpw=; b=b2UcrS+kdydGYWn2QsX8KSJypX9t7qvn3OqKBRg9ixmvZXe6Cih7pA+ZAmh5wSE7jNyvG32966pQCcEpB21zjotB31WTnk2iWf37h7TfIWTK2ITbP5SvSMdrcmhM4rOGZ2ie0ChirLbSuXEVXj0yRRCLexa9ynEXHvsT8xXoCUM= 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 16294709662951009.6919208989384; Fri, 20 Aug 2021 07:49:26 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-192-Gkno4COzO5GrfP-xvxFE6w-1; Fri, 20 Aug 2021 10:49:23 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 286A7100A617; Fri, 20 Aug 2021 14:49:18 +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 0D939369A; Fri, 20 Aug 2021 14:49:18 +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 CADF6181A137; Fri, 20 Aug 2021 14:49:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17KEmxMY025507 for ; Fri, 20 Aug 2021 10:48:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id 71FA56A8FD; Fri, 20 Aug 2021 14:48:59 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id EEC296A8FA for ; Fri, 20 Aug 2021 14:48:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629470965; 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=A31efrhF4oJqGaXPOlzuT58f4jVVOSnNYetyxd6Ljpw=; b=A9jnaneK93+cfAI+kG9JA/o81Xikw5x6mWrmkN4Wee4hdmeSmXsw4sBXqcoxgjd3SpIWZ4 o09JC5aqks5hesPa6PW5h0yWIhF/Js5u5KEOmyqvxzhxnk9bnIMCjDohAa1F215wO2qczM GkLz+G0k6iBU1NtcMki3bpPrs7o/Ncg= X-MC-Unique: Gkno4COzO5GrfP-xvxFE6w-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/9] qemu: monitor: define cleanup function for qemuMonitorCPUModelInfo Date: Fri, 20 Aug 2021 16:48:43 +0200 Message-Id: <814fa4ce19fb35b6a2747ca6a68a421ce1bd8340.1629470763.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.79 on 10.5.11.11 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629471087470100003 Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_monitor.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index f2659d650e..8af271dc96 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -1214,6 +1214,7 @@ int qemuMonitorGetCPUModelExpansion(qemuMonitor *mon, qemuMonitorCPUModelInfo **model_info); =20 void qemuMonitorCPUModelInfoFree(qemuMonitorCPUModelInfo *model_info); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuMonitorCPUModelInfo, qemuMonitorCPUModel= InfoFree); =20 int qemuMonitorGetCPUModelBaseline(qemuMonitor *mon, virCPUDef *cpu_a, --=20 2.31.1 From nobody Mon Apr 29 11:21:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1629470952; cv=none; d=zohomail.com; s=zohoarc; b=LAo7g8Ss2O6EdBn1De2Lpu3qQo/81+TlR97/7pN4DPfuZxftMKZDdpkQMx33EfcRw9oWEAtacsbZO2+L3rtCBO2WsfkQ/hqbbvd7qbt7TweM9Kn8+baJ9i2TKGRELkFYVf96iz7cWqL2iadEIkX29eMTDqjhxRU8HzFWunF2E7g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629470952; 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=sNeL7t7nGnTih3dt9BKtAqx41rDuDD1yAiJfA+sLMvs=; b=hZ3ESghd9vVQpatcTMVQRbn3nWhXxgh5pEdIESrFJN3cpH07op4ihYTwcq5DErMwCa/4k1FXGlPRlPwWLRHf94mFEONsilf1pnE0Rzek2hOO7aRaZRJn/lD1u3gA974SrNDdh+hD15Qq8mjLj/91L3AJ3TM+s2AALsgs4Th+Wv4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 162947095214255.77674143512445; Fri, 20 Aug 2021 07:49:12 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-595-kPJAlG81Nb6afw7d9DCR6Q-1; Fri, 20 Aug 2021 10:49:08 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4C2328799EB; Fri, 20 Aug 2021 14:49:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2EB5E1B46B; Fri, 20 Aug 2021 14:49:03 +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 495044BB7C; Fri, 20 Aug 2021 14:49:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17KEn0Ih025517 for ; Fri, 20 Aug 2021 10:49:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id 41AC06A907; Fri, 20 Aug 2021 14:49:00 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id BE6326A905 for ; Fri, 20 Aug 2021 14:48:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629470950; 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=sNeL7t7nGnTih3dt9BKtAqx41rDuDD1yAiJfA+sLMvs=; b=eCOwLIqT2F5uMJMzXf19/W+GBPvVTTWR3dQIchVKOQderxcx32b2WiDfsBcdhvvde74XxA E4+sl/rFrBK+tfXSjAd5/jAZxfgMhWfhPAbVggwK6afMzz1MVeFPyDwd7KAu06YqA736UA 34S2x5HenqQCkTxK3h3f4BfGgAymfBw= X-MC-Unique: kPJAlG81Nb6afw7d9DCR6Q-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/9] tests: use g_auto in cpuTestMakeQEMUCaps Date: Fri, 20 Aug 2021 16:48:44 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.79 on 10.5.11.13 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629471073212100001 Refactor to use automatic cleanup and remove the goto's. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- tests/cputest.c | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/tests/cputest.c b/tests/cputest.c index 7816de87f7..a87aaa64d0 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -463,18 +463,18 @@ typedef enum { static virQEMUCaps * cpuTestMakeQEMUCaps(const struct data *data) { - virQEMUCaps *qemuCaps =3D NULL; - qemuMonitorTest *testMon =3D NULL; - qemuMonitorCPUModelInfo *model =3D NULL; - virCPUDef *cpu =3D NULL; + g_autoptr(virQEMUCaps) qemuCaps =3D NULL; + g_autoptr(qemuMonitorTest) testMon =3D NULL; + g_autoptr(qemuMonitorCPUModelInfo) model =3D NULL; + g_autoptr(virCPUDef) cpu =3D NULL; bool fail_no_props =3D true; - char *json =3D NULL; + g_autofree char *json =3D NULL; =20 json =3D g_strdup_printf("%s/cputestdata/%s-cpuid-%s.json", abs_srcdir, virArchToString(data->arch), data->host); =20 if (!(testMon =3D qemuMonitorTestNewFromFile(json, driver.xmlopt, true= ))) - goto error; + return NULL; =20 qemuMonitorTestAllowUnusedCommands(testMon); =20 @@ -488,10 +488,10 @@ cpuTestMakeQEMUCaps(const struct data *data) if (qemuMonitorGetCPUModelExpansion(qemuMonitorTestGetMonitor(testMon), QEMU_MONITOR_CPU_MODEL_EXPANSION_S= TATIC, cpu, true, fail_no_props, &model) = < 0) - goto error; + return NULL; =20 if (!(qemuCaps =3D virQEMUCapsNew())) - goto error; + return NULL; =20 virQEMUCapsSet(qemuCaps, QEMU_CAPS_KVM); if (data->flags =3D=3D JSON_MODELS || @@ -504,20 +504,9 @@ cpuTestMakeQEMUCaps(const struct data *data) =20 if (virQEMUCapsProbeCPUDefinitionsTest(qemuCaps, qemuMonitorTestGetMonitor(testM= on)) < 0) - goto error; + return NULL; =20 - cleanup: - qemuMonitorCPUModelInfoFree(model); - qemuMonitorTestFree(testMon); - virCPUDefFree(cpu); - VIR_FREE(json); - - return qemuCaps; - - error: - virObjectUnref(qemuCaps); - qemuCaps =3D NULL; - goto cleanup; + return g_steal_pointer(&qemuCaps); } =20 =20 --=20 2.31.1 From nobody Mon Apr 29 11:21:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1629470965; cv=none; d=zohomail.com; s=zohoarc; b=I264ZBQLxGqArpM/BD/phTNZE1xJXfYClKnzO/Xmj4JavyJ21zGVrL/eqEqYY9xuxg/cNRH4mL5iuwxAh7M6M8aQr38Mnr1BjEt5wyoKrULKHxivM1E6Xdsp8mhD3ElEuDN8YRzBA2N5TavPgI+tCpvTmiH1CUcFosI+J2+lDuM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629470965; 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=9b63E6Mc/MrK+LspLzxzbz31CMzkd3YvAI0dftIYmEs=; b=n1Ub81Yw1wR0gZsnsRK/eUiDzjiNVaUeKIOo3D41x2xuSxcb1A1YxrhXKrf0o4+5kc5XzzvuVcYJaKAONc2AymcQzuSgzzfj9bF6VOKog4rX/51tnQZaG+m8wc0k/dXSbfHtcxxr6W/Quw3nVTEKHrlvJyRXoPNdiYmrdVo+JnQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1629470965783778.8767304970839; Fri, 20 Aug 2021 07:49:25 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-561-GkGrmPVoNCmxCtmVV1c8rA-1; Fri, 20 Aug 2021 10:49:23 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2F6871B2C98B; Fri, 20 Aug 2021 14:49:18 +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 0DD9C5DD68; Fri, 20 Aug 2021 14:49:18 +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 CF934181A1CD; Fri, 20 Aug 2021 14:49:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17KEn1Yb025523 for ; Fri, 20 Aug 2021 10:49:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 157AE5D741; Fri, 20 Aug 2021 14:49:01 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 928856B55E for ; Fri, 20 Aug 2021 14:49:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629470964; 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=9b63E6Mc/MrK+LspLzxzbz31CMzkd3YvAI0dftIYmEs=; b=EpKkxGDibCs1M5kqKjBMhxmrK3TNWAqcrs9azBudMJLnusoqZ9yi7if7RukF1y8ldIgeuh 78Hk+cLuz/H3j4pIDGfe8aBnCBPJykVUfr9LigIzDnFEJxQShczFwNRDd/nPbiktYVfpmg v0bqXuQG65PXm0AOaLw3DNifNWHbn7I= X-MC-Unique: GkGrmPVoNCmxCtmVV1c8rA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 3/9] tests: cputest: use g_auto for virQEMUCaps Date: Fri, 20 Aug 2021 16:48:45 +0200 Message-Id: <7c87b472cfecd007b9f9b7f5d4e9dded4ca5cf99.1629470763.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.79 on 10.5.11.14 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629471086537100001 Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- tests/cputest.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tests/cputest.c b/tests/cputest.c index a87aaa64d0..78521a5cf9 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -514,7 +514,7 @@ static int cpuTestGetCPUModels(const struct data *data, virDomainCapsCPUModels **models) { - virQEMUCaps *qemuCaps; + g_autoptr(virQEMUCaps) qemuCaps =3D NULL; =20 *models =3D NULL; =20 @@ -527,8 +527,6 @@ cpuTestGetCPUModels(const struct data *data, =20 *models =3D virQEMUCapsGetCPUModels(qemuCaps, VIR_DOMAIN_VIRT_KVM, NUL= L, NULL); =20 - virObjectUnref(qemuCaps); - return 0; } =20 @@ -861,7 +859,7 @@ static int cpuTestJSONCPUID(const void *arg) { const struct data *data =3D arg; - virQEMUCaps *qemuCaps =3D NULL; + g_autoptr(virQEMUCaps) qemuCaps =3D NULL; virCPUDef *cpu =3D NULL; char *result =3D NULL; int ret =3D -1; @@ -883,7 +881,6 @@ cpuTestJSONCPUID(const void *arg) ret =3D cpuTestCompareXML(data->arch, cpu, result); =20 cleanup: - virObjectUnref(qemuCaps); virCPUDefFree(cpu); VIR_FREE(result); return ret; @@ -894,7 +891,7 @@ static int cpuTestJSONSignature(const void *arg) { const struct data *data =3D arg; - virQEMUCaps *qemuCaps =3D NULL; + g_autoptr(virQEMUCaps) qemuCaps =3D NULL; virCPUData *hostData =3D NULL; qemuMonitorCPUModelInfo *modelInfo; int ret =3D -1; @@ -909,7 +906,6 @@ cpuTestJSONSignature(const void *arg) ret =3D cpuTestCompareSignature(data, hostData); =20 cleanup: - virObjectUnref(qemuCaps); virCPUDataFree(hostData); return ret; } --=20 2.31.1 From nobody Mon Apr 29 11:21:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1629470952; cv=none; d=zohomail.com; s=zohoarc; b=kCv3x828mp4DS7JNS6zUMQtRXw5w4Z7Uh1VZE2oyvoOv+Uz6viif6J6eo8X7Stn1qdLszm8Etl5mxuyOl/NCaT5TERU0f0YElBy/OUhXTpWbNbbIaGp/oYuH5bTWrXpxPxeFfWo1GR6vJPs96NZzNsOZUSktGOdigEauAchCtE4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629470952; 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=TgzdA7vVvsyxHk/lDnWjJRGnrBOO5EyclZOvpVw2Q1s=; b=VOsUQ/G5A16GEfyQYeRkzM1BUZdcQuCEcg9y69wVh3JrJ6nCuiGDMdW1mOqAjbVeMmJDX9IDbBo9sczgkTuVQ8QA7fycDcWWLFR/fXV2KRSiBmuYumI+He0m8Pfg/zto+KFb25zooAMkrYnT9U8gSsML+iG5QOp+Mepht8HIC00= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1629470952876648.2874959027876; Fri, 20 Aug 2021 07:49:12 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-299-Njl2oZ1qOhSlVsGuKiHqTA-1; Fri, 20 Aug 2021 10:49:09 -0400 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 DD7381B2C992; Fri, 20 Aug 2021 14:49:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B4B3510016F7; Fri, 20 Aug 2021 14:49:03 +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 E81194A7C8; Fri, 20 Aug 2021 14:49:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17KEn1qB025528 for ; Fri, 20 Aug 2021 10:49:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id DCBA06A8F7; Fri, 20 Aug 2021 14:49:01 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 62A3F5D741 for ; Fri, 20 Aug 2021 14:49:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629470951; 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=TgzdA7vVvsyxHk/lDnWjJRGnrBOO5EyclZOvpVw2Q1s=; b=bxXUxEhbp83jCgg1iHWKCFZQZP2aWC+FZNXW23GiWAABKjFyaKeIf/2cTob1UZZB5Lozqm d+g04bqpUoWp0VCM2ldnW5MovXdHk4nUu2INitiAfVU0aUr3uSaTB97xIHm5vxG+7O6GlK hzyIphOHXIw7PIuFdyw1cYP9oZKDOw8= X-MC-Unique: Njl2oZ1qOhSlVsGuKiHqTA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 4/9] tests: cputest: use g_auto for virCPUData Date: Fri, 20 Aug 2021 16:48:46 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629471073906100003 Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- tests/cputest.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/tests/cputest.c b/tests/cputest.c index 78521a5cf9..5cf6db9be3 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -404,7 +404,7 @@ cpuTestHasFeature(const void *arg) const struct data *data =3D arg; int ret =3D -1; virCPUDef *host =3D NULL; - virCPUData *hostData =3D NULL; + g_autoptr(virCPUData) hostData =3D NULL; int result; =20 if (!(host =3D cpuTestLoadXML(data->arch, data->host))) @@ -434,7 +434,6 @@ cpuTestHasFeature(const void *arg) ret =3D 0; =20 cleanup: - virCPUDataFree(hostData); virCPUDefFree(host); return ret; } @@ -552,7 +551,7 @@ cpuTestCPUID(bool guest, const void *arg) { const struct data *data =3D arg; int ret =3D -1; - virCPUData *hostData =3D NULL; + g_autoptr(virCPUData) hostData =3D NULL; char *hostFile =3D NULL; char *host =3D NULL; virCPUDef *cpu =3D NULL; @@ -596,7 +595,6 @@ cpuTestCPUID(bool guest, const void *arg) cleanup: VIR_FREE(hostFile); VIR_FREE(host); - virCPUDataFree(hostData); virCPUDefFree(cpu); VIR_FREE(result); virObjectUnref(models); @@ -646,7 +644,7 @@ static int cpuTestCPUIDSignature(const void *arg) { const struct data *data =3D arg; - virCPUData *hostData =3D NULL; + g_autoptr(virCPUData) hostData =3D NULL; char *hostFile =3D NULL; char *host =3D NULL; int ret =3D -1; @@ -661,7 +659,6 @@ cpuTestCPUIDSignature(const void *arg) ret =3D cpuTestCompareSignature(data, hostData); =20 cleanup: - virCPUDataFree(hostData); VIR_FREE(hostFile); VIR_FREE(host); return ret; @@ -765,10 +762,10 @@ cpuTestUpdateLive(const void *arg) virCPUDef *cpu =3D NULL; char *enabledFile =3D NULL; char *enabled =3D NULL; - virCPUData *enabledData =3D NULL; + g_autoptr(virCPUData) enabledData =3D NULL; char *disabledFile =3D NULL; char *disabled =3D NULL; - virCPUData *disabledData =3D NULL; + g_autoptr(virCPUData) disabledData =3D NULL; char *expectedFile =3D NULL; virCPUDef *expected =3D NULL; virDomainCapsCPUModels *hvModels =3D NULL; @@ -842,10 +839,8 @@ cpuTestUpdateLive(const void *arg) virCPUDefFree(cpu); VIR_FREE(enabledFile); VIR_FREE(enabled); - virCPUDataFree(enabledData); VIR_FREE(disabledFile); VIR_FREE(disabled); - virCPUDataFree(disabledData); VIR_FREE(expectedFile); virCPUDefFree(expected); virObjectUnref(hvModels); @@ -892,7 +887,7 @@ cpuTestJSONSignature(const void *arg) { const struct data *data =3D arg; g_autoptr(virQEMUCaps) qemuCaps =3D NULL; - virCPUData *hostData =3D NULL; + g_autoptr(virCPUData) hostData =3D NULL; qemuMonitorCPUModelInfo *modelInfo; int ret =3D -1; =20 @@ -906,7 +901,6 @@ cpuTestJSONSignature(const void *arg) ret =3D cpuTestCompareSignature(data, hostData); =20 cleanup: - virCPUDataFree(hostData); return ret; } #endif --=20 2.31.1 From nobody Mon Apr 29 11:21:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1629470967; cv=none; d=zohomail.com; s=zohoarc; b=B78P68Dig5U7hFohYHBT/9fi8dY6E9YAlMvFOJrPxr5INbVVpgrdbxuMk6VHrDzmSoBFwT4PazOS6V5cAsS3DHNLBYRsdeKIrIFsvEKHzl4RAK4o49eHg92tEZHvwnNqvTscXCVd3Le9VE+U6t/6vG/+e7Mw1QnIqkR66Ix1rAU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629470967; 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=WKGAn5U18TJZhVPPJXJne5HWrsNtlnAxE5BxXX8s/m4=; b=jck+smdrc4I9cR/iHiU86aONkjcoTX/cq8Vyo4E1Ry/Q1X+mnJMCgr4QmaVU+VhL9MeVfPqpCipCapKUTWvOKvC7GB8+RJJO7gM5z+IHSIK/w646pzxqOopTM/9letDOUQFm0mjKGUIiG/gsNseoH8lmKUNyXY1b7hZzbS7BzdE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1629470967815237.10748743807346; Fri, 20 Aug 2021 07:49:27 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-85-W7FrBChVNqGIbsKu2IcIvg-1; Fri, 20 Aug 2021 10:49:24 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 20DFA1B2C98A; Fri, 20 Aug 2021 14:49:18 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 007EE5D9D5; Fri, 20 Aug 2021 14:49:17 +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 C21754A7CD; Fri, 20 Aug 2021 14:49:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17KEn20S025536 for ; Fri, 20 Aug 2021 10:49:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id ACF036A8F7; Fri, 20 Aug 2021 14:49:02 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 346AA5D741 for ; Fri, 20 Aug 2021 14:49:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629470966; 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=WKGAn5U18TJZhVPPJXJne5HWrsNtlnAxE5BxXX8s/m4=; b=N3emfe8StsDbTAYyEKA3HuLAjpDZ5/DbFNUw5E2VxoNCG9ztWBYWUbI6RcioCMeC9q93Qn 0EkCER4v4MNXAfYoFzfqDCg/H79wHw2DbtX8LAt4za8kVy+THLCR9fxbNZ2E3fupvXM5dn 5s/kVOedAqMk8ymtMj1XRe0RNjV7PNk= X-MC-Unique: W7FrBChVNqGIbsKu2IcIvg-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 5/9] tests: cputest: use g_auto for virCPUDef Date: Fri, 20 Aug 2021 16:48:47 +0200 Message-Id: <76bec8abfb147738aca000025318c5d06ddee61f.1629470763.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.79 on 10.5.11.14 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629471088829100005 Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- tests/cputest.c | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/tests/cputest.c b/tests/cputest.c index 5cf6db9be3..9fd5b38b78 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -193,8 +193,8 @@ cpuTestCompare(const void *arg) { const struct data *data =3D arg; int ret =3D -1; - virCPUDef *host =3D NULL; - virCPUDef *cpu =3D NULL; + g_autoptr(virCPUDef) host =3D NULL; + g_autoptr(virCPUDef) cpu =3D NULL; virCPUCompareResult result; =20 if (!(host =3D cpuTestLoadXML(data->arch, data->host)) || @@ -217,8 +217,6 @@ cpuTestCompare(const void *arg) ret =3D 0; =20 cleanup: - virCPUDefFree(host); - virCPUDefFree(cpu); return ret; } =20 @@ -228,8 +226,8 @@ cpuTestGuestCPU(const void *arg) { const struct data *data =3D arg; int ret =3D -2; - virCPUDef *host =3D NULL; - virCPUDef *cpu =3D NULL; + g_autoptr(virCPUDef) host =3D NULL; + g_autoptr(virCPUDef) cpu =3D NULL; virCPUCompareResult cmpResult; g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; char *result =3D NULL; @@ -268,8 +266,6 @@ cpuTestGuestCPU(const void *arg) =20 cleanup: VIR_FREE(result); - virCPUDefFree(host); - virCPUDefFree(cpu); =20 if (ret =3D=3D data->result) { /* We got the result we expected, whether it was @@ -370,9 +366,9 @@ cpuTestUpdate(const void *arg) { const struct data *data =3D arg; int ret =3D -1; - virCPUDef *host =3D NULL; - virCPUDef *migHost =3D NULL; - virCPUDef *cpu =3D NULL; + g_autoptr(virCPUDef) host =3D NULL; + g_autoptr(virCPUDef) migHost =3D NULL; + g_autoptr(virCPUDef) cpu =3D NULL; char *result =3D NULL; =20 if (!(host =3D cpuTestLoadXML(data->arch, data->host)) || @@ -390,9 +386,6 @@ cpuTestUpdate(const void *arg) ret =3D cpuTestCompareXML(data->arch, cpu, result); =20 cleanup: - virCPUDefFree(host); - virCPUDefFree(cpu); - virCPUDefFree(migHost); VIR_FREE(result); return ret; } @@ -403,7 +396,7 @@ cpuTestHasFeature(const void *arg) { const struct data *data =3D arg; int ret =3D -1; - virCPUDef *host =3D NULL; + g_autoptr(virCPUDef) host =3D NULL; g_autoptr(virCPUData) hostData =3D NULL; int result; =20 @@ -434,7 +427,6 @@ cpuTestHasFeature(const void *arg) ret =3D 0; =20 cleanup: - virCPUDefFree(host); return ret; } =20 @@ -554,7 +546,7 @@ cpuTestCPUID(bool guest, const void *arg) g_autoptr(virCPUData) hostData =3D NULL; char *hostFile =3D NULL; char *host =3D NULL; - virCPUDef *cpu =3D NULL; + g_autoptr(virCPUDef) cpu =3D NULL; char *result =3D NULL; virDomainCapsCPUModels *models =3D NULL; =20 @@ -595,7 +587,6 @@ cpuTestCPUID(bool guest, const void *arg) cleanup: VIR_FREE(hostFile); VIR_FREE(host); - virCPUDefFree(cpu); VIR_FREE(result); virObjectUnref(models); return ret; @@ -759,7 +750,7 @@ cpuTestUpdateLive(const void *arg) { const struct data *data =3D arg; char *cpuFile =3D NULL; - virCPUDef *cpu =3D NULL; + g_autoptr(virCPUDef) cpu =3D NULL; char *enabledFile =3D NULL; char *enabled =3D NULL; g_autoptr(virCPUData) enabledData =3D NULL; @@ -767,7 +758,7 @@ cpuTestUpdateLive(const void *arg) char *disabled =3D NULL; g_autoptr(virCPUData) disabledData =3D NULL; char *expectedFile =3D NULL; - virCPUDef *expected =3D NULL; + g_autoptr(virCPUDef) expected =3D NULL; virDomainCapsCPUModels *hvModels =3D NULL; virDomainCapsCPUModels *models =3D NULL; int ret =3D -1; @@ -836,13 +827,11 @@ cpuTestUpdateLive(const void *arg) =20 cleanup: VIR_FREE(cpuFile); - virCPUDefFree(cpu); VIR_FREE(enabledFile); VIR_FREE(enabled); VIR_FREE(disabledFile); VIR_FREE(disabled); VIR_FREE(expectedFile); - virCPUDefFree(expected); virObjectUnref(hvModels); virObjectUnref(models); return ret; @@ -855,7 +844,7 @@ cpuTestJSONCPUID(const void *arg) { const struct data *data =3D arg; g_autoptr(virQEMUCaps) qemuCaps =3D NULL; - virCPUDef *cpu =3D NULL; + g_autoptr(virCPUDef) cpu =3D NULL; char *result =3D NULL; int ret =3D -1; =20 @@ -876,7 +865,6 @@ cpuTestJSONCPUID(const void *arg) ret =3D cpuTestCompareXML(data->arch, cpu, result); =20 cleanup: - virCPUDefFree(cpu); VIR_FREE(result); return ret; } --=20 2.31.1 From nobody Mon Apr 29 11:21:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1629471005; cv=none; d=zohomail.com; s=zohoarc; b=OgRPX7DT0OtEqCCkOKgP8PFjW9e/A39DSj2xgz89CIjh1W/bWnwz5YCUCHU0Pfdn/2zrIHuKD3WoFZhoWb4DcHqhGiX5BJY8aufX1RrY2y0EgkwxxOR29qFs+8M01YkYDXJfpB/2jFoO/BCi5jhIsXTG/qaY8BQTTxotZCLQYOo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629471005; 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=ISNGZj/NHYizBB0uyj6AGuw0RuxemAm/3S9T8TeRTPU=; b=Gi0mTfeAtBhtWlUYdA/JK1J0P+9wDxrZkQ5LBq6OMRMK/4X9Pe1Z42atuCfMu3MS2Mmy8ERIv9wNI1iCtAD60czlpGz5wCj4JvUxzuj5novdkmAGgT01/hy1a5KDhHaT1NkXlF20UGSQ+WB/kRrEeMQQOAd5ojmnikdSKMtsRto= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1629471005060836.7583880717482; Fri, 20 Aug 2021 07:50:05 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-14-hG3FHaMiOyGWllgAd7ZnCA-1; Fri, 20 Aug 2021 10:49:28 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1AA121B2C987; Fri, 20 Aug 2021 14:49:21 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E3653E2FC; Fri, 20 Aug 2021 14:49:20 +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 AD7834A704; Fri, 20 Aug 2021 14:49:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17KEn3Ck025548 for ; Fri, 20 Aug 2021 10:49:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7B5026A8F7; Fri, 20 Aug 2021 14:49:03 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 048DA5D741 for ; Fri, 20 Aug 2021 14:49:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629471004; 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=ISNGZj/NHYizBB0uyj6AGuw0RuxemAm/3S9T8TeRTPU=; b=UWJUp+jjgdAwfsG70TAVOKUxofs6fpQuAF2fYNR42SXkoeCD4mJU4ezKG8ZVprF3P1bLV8 52ryzpxvM3byD8WuzSX/NCEGsGMu6Rx/72Dso0J35F8Afauy5wYlnSjuQopYx7Lo6HEAWq 23GWRosQ/GT7VMbhXQa96SdvZo1SpPA= X-MC-Unique: hG3FHaMiOyGWllgAd7ZnCA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 6/9] tests: cputest: use g_autofree Date: Fri, 20 Aug 2021 16:48:48 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.23 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629471128381100001 Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- tests/cputest.c | 58 ++++++++++++++++--------------------------------- 1 file changed, 19 insertions(+), 39 deletions(-) diff --git a/tests/cputest.c b/tests/cputest.c index 9fd5b38b78..2dc7e2e5ae 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -138,8 +138,8 @@ cpuTestCompareXML(virArch arch, virCPUDef *cpu, const char *name) { - char *xml =3D NULL; - char *actual =3D NULL; + g_autofree char *xml =3D NULL; + g_autofree char *actual =3D NULL; int ret =3D -1; =20 xml =3D g_strdup_printf("%s/cputestdata/%s-%s.xml", abs_srcdir, @@ -154,8 +154,6 @@ cpuTestCompareXML(virArch arch, ret =3D 0; =20 cleanup: - VIR_FREE(xml); - VIR_FREE(actual); return ret; } =20 @@ -230,7 +228,7 @@ cpuTestGuestCPU(const void *arg) g_autoptr(virCPUDef) cpu =3D NULL; virCPUCompareResult cmpResult; g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - char *result =3D NULL; + g_autofree char *result =3D NULL; =20 if (!(host =3D cpuTestLoadXML(data->arch, data->host)) || !(cpu =3D cpuTestLoadXML(data->arch, data->name))) @@ -265,8 +263,6 @@ cpuTestGuestCPU(const void *arg) ret =3D 0; =20 cleanup: - VIR_FREE(result); - if (ret =3D=3D data->result) { /* We got the result we expected, whether it was * a success or a failure */ @@ -292,7 +288,7 @@ cpuTestBaseline(const void *arg) virCPUDef **cpus =3D NULL; virCPUDef *baseline =3D NULL; unsigned int ncpus =3D 0; - char *result =3D NULL; + g_autofree char *result =3D NULL; const char *suffix; size_t i; =20 @@ -356,7 +352,6 @@ cpuTestBaseline(const void *arg) VIR_FREE(cpus); } virCPUDefFree(baseline); - VIR_FREE(result); return ret; } =20 @@ -369,7 +364,7 @@ cpuTestUpdate(const void *arg) g_autoptr(virCPUDef) host =3D NULL; g_autoptr(virCPUDef) migHost =3D NULL; g_autoptr(virCPUDef) cpu =3D NULL; - char *result =3D NULL; + g_autofree char *result =3D NULL; =20 if (!(host =3D cpuTestLoadXML(data->arch, data->host)) || !(cpu =3D cpuTestLoadXML(data->arch, data->name))) @@ -386,7 +381,6 @@ cpuTestUpdate(const void *arg) ret =3D cpuTestCompareXML(data->arch, cpu, result); =20 cleanup: - VIR_FREE(result); return ret; } =20 @@ -544,10 +538,10 @@ cpuTestCPUID(bool guest, const void *arg) const struct data *data =3D arg; int ret =3D -1; g_autoptr(virCPUData) hostData =3D NULL; - char *hostFile =3D NULL; - char *host =3D NULL; + g_autofree char *hostFile =3D NULL; + g_autofree char *host =3D NULL; g_autoptr(virCPUDef) cpu =3D NULL; - char *result =3D NULL; + g_autofree char *result =3D NULL; virDomainCapsCPUModels *models =3D NULL; =20 hostFile =3D g_strdup_printf("%s/cputestdata/%s-cpuid-%s.xml", abs_src= dir, @@ -585,9 +579,6 @@ cpuTestCPUID(bool guest, const void *arg) ret =3D cpuTestCompareXML(data->arch, cpu, result); =20 cleanup: - VIR_FREE(hostFile); - VIR_FREE(host); - VIR_FREE(result); virObjectUnref(models); return ret; } @@ -636,8 +627,8 @@ cpuTestCPUIDSignature(const void *arg) { const struct data *data =3D arg; g_autoptr(virCPUData) hostData =3D NULL; - char *hostFile =3D NULL; - char *host =3D NULL; + g_autofree char *hostFile =3D NULL; + g_autofree char *host =3D NULL; int ret =3D -1; =20 hostFile =3D g_strdup_printf("%s/cputestdata/%s-cpuid-%s.xml", abs_src= dir, @@ -650,8 +641,6 @@ cpuTestCPUIDSignature(const void *arg) ret =3D cpuTestCompareSignature(data, hostData); =20 cleanup: - VIR_FREE(hostFile); - VIR_FREE(host); return ret; } =20 @@ -749,15 +738,15 @@ static int cpuTestUpdateLive(const void *arg) { const struct data *data =3D arg; - char *cpuFile =3D NULL; + g_autofree char *cpuFile =3D NULL; g_autoptr(virCPUDef) cpu =3D NULL; - char *enabledFile =3D NULL; - char *enabled =3D NULL; + g_autofree char *enabledFile =3D NULL; + g_autofree char *enabled =3D NULL; g_autoptr(virCPUData) enabledData =3D NULL; - char *disabledFile =3D NULL; - char *disabled =3D NULL; + g_autofree char *disabledFile =3D NULL; + g_autofree char *disabled =3D NULL; g_autoptr(virCPUData) disabledData =3D NULL; - char *expectedFile =3D NULL; + g_autofree char *expectedFile =3D NULL; g_autoptr(virCPUDef) expected =3D NULL; virDomainCapsCPUModels *hvModels =3D NULL; virDomainCapsCPUModels *models =3D NULL; @@ -826,12 +815,6 @@ cpuTestUpdateLive(const void *arg) ret =3D cpuTestUpdateLiveCompare(data->arch, cpu, expected); =20 cleanup: - VIR_FREE(cpuFile); - VIR_FREE(enabledFile); - VIR_FREE(enabled); - VIR_FREE(disabledFile); - VIR_FREE(disabled); - VIR_FREE(expectedFile); virObjectUnref(hvModels); virObjectUnref(models); return ret; @@ -845,7 +828,7 @@ cpuTestJSONCPUID(const void *arg) const struct data *data =3D arg; g_autoptr(virQEMUCaps) qemuCaps =3D NULL; g_autoptr(virCPUDef) cpu =3D NULL; - char *result =3D NULL; + g_autofree char *result =3D NULL; int ret =3D -1; =20 result =3D g_strdup_printf("cpuid-%s-json", data->host); @@ -865,7 +848,6 @@ cpuTestJSONCPUID(const void *arg) ret =3D cpuTestCompareXML(data->arch, cpu, result); =20 cleanup: - VIR_FREE(result); return ret; } =20 @@ -957,7 +939,7 @@ mymain(void) models =3D=3D NULL ? NULL : #models, \ flags, result \ }; \ - char *testLabel; \ + g_autofree char *testLabel =3D NULL; \ \ g_free(virTestLogContentAndReset());\ \ @@ -975,7 +957,6 @@ mymain(void) ret =3D -1; \ } \ \ - VIR_FREE(testLabel); \ } while (0) =20 #define DO_TEST_COMPARE(arch, host, cpu, result) \ @@ -997,7 +978,7 @@ mymain(void) #define DO_TEST_BASELINE(arch, name, flags, result) \ do { \ const char *suffix =3D ""; \ - char *label; \ + g_autofree char *label =3D NULL; \ if ((flags) & VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES) \ suffix =3D " (expanded)"; \ if ((flags) & VIR_CONNECT_BASELINE_CPU_MIGRATABLE) \ @@ -1005,7 +986,6 @@ mymain(void) label =3D g_strdup_printf("%s%s", name, suffix); \ DO_TEST(arch, cpuTestBaseline, label, NULL, \ "baseline-" name, NULL, flags, result); \ - VIR_FREE(label); \ } while (0) =20 #define DO_TEST_HASFEATURE(arch, host, feature, result) \ --=20 2.31.1 From nobody Mon Apr 29 11:21:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1629470969; cv=none; d=zohomail.com; s=zohoarc; b=jBr7RTwUt6ERWGXvXHFwhD5U9JV4jEcjjfLQolgGNTImlYcSu0hc7s/sdQeQGfZdYPAoMbFzICT5j/K2vXPrqfgvCyhd+eQHdZzorjCAY+yRrkAJv9QFBJU2Mh0lQyWjx80F6EuBIqeEn27ZYIHc/i0yvElHRXWldKxj8Jn7DbM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629470969; 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=bi7m7dfyxzt+rTPnbm7oQJ+rUl6Fy9BwYLkF60k1NmA=; b=YgpAm/SYjx4+SzXLugPbQPtwe5J2flKETCti4Hu00FwrZYaIsxukecy2c/uhNFinJqBBYD71RhUoVfJeFFRbcLIvedIMrk7z1JD4ps3e31CyGklEsrsFjM91NFZ3GGaOnxmxoDTJw44oTYXUuFPnHzutbdQbQUNEYxaFXX/TKmw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1629470969206695.174443930156; Fri, 20 Aug 2021 07:49:29 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-121-TOypEDOkNPq1qquD9C1Grw-1; Fri, 20 Aug 2021 10:49:26 -0400 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 2E32B80292B; Fri, 20 Aug 2021 14:49: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 0819610016F7; Fri, 20 Aug 2021 14:49: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 BC93C181A2A7; Fri, 20 Aug 2021 14:49:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17KEn4Wt025561 for ; Fri, 20 Aug 2021 10:49:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4AF1A6A901; Fri, 20 Aug 2021 14:49:04 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id C7FCB5D741 for ; Fri, 20 Aug 2021 14:49:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629470968; 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=bi7m7dfyxzt+rTPnbm7oQJ+rUl6Fy9BwYLkF60k1NmA=; b=AE+/E/8PAkXeVR7YZRycwN8C5V1qCdzpxUZSN41p+tIiB7kDDg21VPPeUQM8XrXq1vJ740 WRBfeAeYVE6dgiGcdRc0HajJhF26FLtbsaAWFt6AJf2Z9/Li6N/7b+lKEL8xbZ3/2ECXB1 0tKuZqyM2tlM1GdPnLvZdBKrrUiOkm0= X-MC-Unique: TOypEDOkNPq1qquD9C1Grw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 7/9] tests: cputest: remove unnecessary labels Date: Fri, 20 Aug 2021 16:48:49 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629471090602100007 Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- tests/cputest.c | 72 +++++++++++++++---------------------------------- 1 file changed, 22 insertions(+), 50 deletions(-) diff --git a/tests/cputest.c b/tests/cputest.c index 2dc7e2e5ae..c8030be093 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -140,21 +140,17 @@ cpuTestCompareXML(virArch arch, { g_autofree char *xml =3D NULL; g_autofree char *actual =3D NULL; - int ret =3D -1; =20 xml =3D g_strdup_printf("%s/cputestdata/%s-%s.xml", abs_srcdir, virArchToString(arch), name); =20 if (!(actual =3D virCPUDefFormat(cpu, NULL))) - goto cleanup; + return -1; =20 if (virTestCompareToFile(actual, xml) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -190,14 +186,13 @@ static int cpuTestCompare(const void *arg) { const struct data *data =3D arg; - int ret =3D -1; g_autoptr(virCPUDef) host =3D NULL; g_autoptr(virCPUDef) cpu =3D NULL; virCPUCompareResult result; =20 if (!(host =3D cpuTestLoadXML(data->arch, data->host)) || !(cpu =3D cpuTestLoadXML(data->arch, data->name))) - goto cleanup; + return -1; =20 result =3D virCPUCompare(host->arch, host, cpu, false); if (data->result =3D=3D VIR_CPU_COMPARE_ERROR) @@ -209,13 +204,10 @@ cpuTestCompare(const void *arg) cpuTestCompResStr(result)); /* Pad to line up with test name ... in virTestRun */ VIR_TEST_VERBOSE("%74s", "... "); - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -360,7 +352,6 @@ static int cpuTestUpdate(const void *arg) { const struct data *data =3D arg; - int ret =3D -1; g_autoptr(virCPUDef) host =3D NULL; g_autoptr(virCPUDef) migHost =3D NULL; g_autoptr(virCPUDef) cpu =3D NULL; @@ -368,20 +359,17 @@ cpuTestUpdate(const void *arg) =20 if (!(host =3D cpuTestLoadXML(data->arch, data->host)) || !(cpu =3D cpuTestLoadXML(data->arch, data->name))) - goto cleanup; + return -1; =20 if (!(migHost =3D virCPUCopyMigratable(data->arch, host))) - goto cleanup; + return -1; =20 if (virCPUUpdate(host->arch, cpu, migHost) < 0) - goto cleanup; + return -1; =20 result =3D g_strdup_printf("%s+%s", data->host, data->name); =20 - ret =3D cpuTestCompareXML(data->arch, cpu, result); - - cleanup: - return ret; + return cpuTestCompareXML(data->arch, cpu, result); } =20 =20 @@ -389,17 +377,16 @@ static int cpuTestHasFeature(const void *arg) { const struct data *data =3D arg; - int ret =3D -1; g_autoptr(virCPUDef) host =3D NULL; g_autoptr(virCPUData) hostData =3D NULL; int result; =20 if (!(host =3D cpuTestLoadXML(data->arch, data->host))) - goto cleanup; + return -1; =20 if (cpuEncode(host->arch, host, NULL, &hostData, NULL, NULL, NULL, NULL) < 0) - goto cleanup; + return -1; =20 result =3D virCPUCheckFeature(host->arch, host, data->name); =20 @@ -415,13 +402,10 @@ cpuTestHasFeature(const void *arg) cpuTestBoolWithErrorStr(result)); /* Pad to line up with test name ... in virTestRun */ VIR_TEST_VERBOSE("%74s", "... "); - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -629,19 +613,15 @@ cpuTestCPUIDSignature(const void *arg) g_autoptr(virCPUData) hostData =3D NULL; g_autofree char *hostFile =3D NULL; g_autofree char *host =3D NULL; - int ret =3D -1; =20 hostFile =3D g_strdup_printf("%s/cputestdata/%s-cpuid-%s.xml", abs_src= dir, virArchToString(data->arch), data->host); =20 if (virTestLoadFile(hostFile, &host) < 0 || !(hostData =3D virCPUDataParse(host))) - goto cleanup; + return -1; =20 - ret =3D cpuTestCompareSignature(data, hostData); - - cleanup: - return ret; + return cpuTestCompareSignature(data, hostData); } =20 =20 @@ -829,12 +809,11 @@ cpuTestJSONCPUID(const void *arg) g_autoptr(virQEMUCaps) qemuCaps =3D NULL; g_autoptr(virCPUDef) cpu =3D NULL; g_autofree char *result =3D NULL; - int ret =3D -1; =20 result =3D g_strdup_printf("cpuid-%s-json", data->host); =20 if (!(qemuCaps =3D cpuTestMakeQEMUCaps(data))) - goto cleanup; + return -1; =20 cpu =3D virCPUDefNew(); cpu->arch =3D data->arch; @@ -843,12 +822,9 @@ cpuTestJSONCPUID(const void *arg) cpu->fallback =3D VIR_CPU_FALLBACK_FORBID; =20 if (virQEMUCapsInitCPUModel(qemuCaps, VIR_DOMAIN_VIRT_KVM, cpu, false)= !=3D 0) - goto cleanup; + return -1; =20 - ret =3D cpuTestCompareXML(data->arch, cpu, result); - - cleanup: - return ret; + return cpuTestCompareXML(data->arch, cpu, result); } =20 =20 @@ -859,19 +835,15 @@ cpuTestJSONSignature(const void *arg) g_autoptr(virQEMUCaps) qemuCaps =3D NULL; g_autoptr(virCPUData) hostData =3D NULL; qemuMonitorCPUModelInfo *modelInfo; - int ret =3D -1; =20 if (!(qemuCaps =3D cpuTestMakeQEMUCaps(data))) - goto cleanup; + return -1; =20 modelInfo =3D virQEMUCapsGetCPUModelInfo(qemuCaps, VIR_DOMAIN_VIRT_KVM= ); if (!(hostData =3D virQEMUCapsGetCPUModelX86Data(qemuCaps, modelInfo, = false))) - goto cleanup; + return -1; =20 - ret =3D cpuTestCompareSignature(data, hostData); - - cleanup: - return ret; + return cpuTestCompareSignature(data, hostData); } #endif =20 --=20 2.31.1 From nobody Mon Apr 29 11:21:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1629470969; cv=none; d=zohomail.com; s=zohoarc; b=Jv/jLnHxKmNTsvFUbRgm3YRltRvQV9LL94HNiiFBgAxxi3CwFFh5idMWYZHt5K6T3gLXUiyeGwYcrE9yPpUv960Ak+vX2GuA/K6LU5wNVmg3VcTMZxRyQiEMH3aN2AixJrIs9GfSa3tQ/tmuXykDPnszs0ohTNtJQ59hUyMEomU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629470969; 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=xSzPwNouP+HYX61V4Q5uEZxNnlI6afwjLOwe5tfwRx0=; b=WjTnBj+ojrJxnrzV9lML7WvL4QbVaXyQ7Romjqxh7LRiDKvPf4uTrrWVdjpUsK9bcRCN0QK/t9oBaT0jor0CN6hx5nQhuNxbQWLuQe7cNkCY2UCNmO2lX2ptu9VdXbQwBTXE/W/T0Y8Z6MF3E5WOVLVXZkvQdWz3p8GJNInBd5c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1629470969475722.2923606018384; Fri, 20 Aug 2021 07:49:29 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-403-SmzZVC5DM56qBzB6bOfZew-1; Fri, 20 Aug 2021 10:49:27 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E8A0E8799FB; Fri, 20 Aug 2021 14:49:20 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CA7165F724; Fri, 20 Aug 2021 14:49:20 +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 9592A4A707; Fri, 20 Aug 2021 14:49:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17KEn5i3025568 for ; Fri, 20 Aug 2021 10:49:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1AC426A901; Fri, 20 Aug 2021 14:49:05 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 97DDB5D741 for ; Fri, 20 Aug 2021 14:49:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629470968; 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=xSzPwNouP+HYX61V4Q5uEZxNnlI6afwjLOwe5tfwRx0=; b=KeRDPXr2J3EoiL27vFZinZ95/ptfh/w6KSipkhV9yQu2MgmI83+6HuDdr9Q9NHi10DwISU By1KjpSqOxQi78/FVUu4e2AZ3oalPrP1PwYF+B7CXYU+37Zb3yKbR2iFIcBENAYGiFr/vM 0R0Wl8KturPxzGr6UDFWKE4wvMVbh4E= X-MC-Unique: SmzZVC5DM56qBzB6bOfZew-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 8/9] tests: cputests: introduce and use virTestRunLog Date: Fri, 20 Aug 2021 16:48:50 +0200 Message-Id: <13c6ec1ac0976aeb891ebdd863ef907f8921c765.1629470763.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.79 on 10.5.11.16 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629471090920100009 A helper that resets the log before each test and prints it on failure. It also takes the return variable as an argument, so it can be used to eliminate number of branches the compiler has to consider in the main function. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- tests/cputest.c | 14 +------------- tests/testutils.c | 30 ++++++++++++++++++++++++++++++ tests/testutils.h | 4 ++++ 3 files changed, 35 insertions(+), 13 deletions(-) diff --git a/tests/cputest.c b/tests/cputest.c index c8030be093..3e99b9486b 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -912,23 +912,11 @@ mymain(void) flags, result \ }; \ g_autofree char *testLabel =3D NULL; \ - \ - g_free(virTestLogContentAndReset());\ \ testLabel =3D g_strdup_printf("%s(%s): %s", #api, \ virArchToString(arch), name); \ \ - if (virTestRun(testLabel, api, &data) < 0) { \ - if (virTestGetDebug()) { \ - char *log; \ - if ((log =3D virTestLogContentAndReset()) && \ - strlen(log) > 0) \ - VIR_TEST_DEBUG("\n%s", log); \ - VIR_FREE(log); \ - } \ - ret =3D -1; \ - } \ - \ + virTestRunLog(&ret, testLabel, api, &data); \ } while (0) =20 #define DO_TEST_COMPARE(arch, host, cpu, result) \ diff --git a/tests/testutils.c b/tests/testutils.c index 682fa142b5..5e9835ee89 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -180,6 +180,36 @@ virTestRun(const char *title, } =20 =20 +/* + * A wrapper for virTestRun that resets the log content before each run + * and sets ret to -1 on failure. On success, ret is untouched. + */ +void +virTestRunLog(int *ret, + const char *title, + int (*body)(const void *data), + const void *data) +{ + int rc; + + g_free(virTestLogContentAndReset()); + + rc =3D virTestRun(title, body, data); + + if (rc >=3D 0) + return; + + *ret =3D -1; + + if (virTestGetDebug()) { + g_autofree char *log =3D virTestLogContentAndReset(); + + if (strlen(log) > 0) + VIR_TEST_DEBUG("\n%s", log); + } +} + + /** * virTestLoadFile: * @file: name of the file to load diff --git a/tests/testutils.h b/tests/testutils.h index 6848323586..48de864131 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -40,6 +40,10 @@ extern virArch virTestHostArch; int virTestRun(const char *title, int (*body)(const void *data), const void *data); +void virTestRunLog(int *ret, + const char *title, + int (*body)(const void *data), + const void *data); int virTestLoadFile(const char *file, char **buf); char *virTestLoadFilePath(const char *p, ...) G_GNUC_NULL_TERMINATED; --=20 2.31.1 From nobody Mon Apr 29 11:21:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1629471013; cv=none; d=zohomail.com; s=zohoarc; b=DIlAOWwMO4N3TvMen050HJcirpcAb4APBKny5UFlHMs1yS1X/SaZe212Vf4QsyMybHprOxVoZ5QIquZBMu6XP/GUOkk84lgX2EruV37CqPj4WkvxTKDWHdfSl6uSzCYnuCB73ln92sKCYxJIennJrK5cdfY+JDXJzT69NlnHwmg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629471013; 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=bNLTka+4nH+o/G19yxx5oicXrEpFqA7ZaIXHfaGIXO0=; b=Se8klzJ378k8IBQcU4NrkZAdALqYuSdHkEfqcSBN4W6YD4jT6bOCjFcJvsPyIKDhdesL8SA8Zr0MJt1mtCEg5Camkb0SqiqCT+LcLYk3ZzjE5+Qu/2TBJnH3E1Q4gAx/OORUWnQvPnvX4ItKi4I+p+BvJQIffbVrqnAO5JCon+8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1629471013112356.39164208997033; Fri, 20 Aug 2021 07:50:13 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-480-UkgwQ45zOv6Vlpylh_ILbQ-1; Fri, 20 Aug 2021 10:49:31 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D83AE3E74D; Fri, 20 Aug 2021 14:49:23 +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 BD4F51B46B; Fri, 20 Aug 2021 14:49:23 +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 8C276181A2A7; Fri, 20 Aug 2021 14:49:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17KEn5gG025578 for ; Fri, 20 Aug 2021 10:49:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id DDA086A901; Fri, 20 Aug 2021 14:49:05 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 670F65D741 for ; Fri, 20 Aug 2021 14:49:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629471012; 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=bNLTka+4nH+o/G19yxx5oicXrEpFqA7ZaIXHfaGIXO0=; b=FmjcchpTiU2GFf3RG+PmNMQALWbSKb+6g3aFXGwnq3W+2FQ6oBtRktYsVUzr8nZZ1fQxsT KJ+AChruo1gcFP0pmAolmZF9jIosDUqU3zFLfTF31F4Lte4OuR9cdJqDPCceMd4r55PCls U/0Lh9aHlKgmqlabP05/gHkGxgLS3t0= X-MC-Unique: UkgwQ45zOv6Vlpylh_ILbQ-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 9/9] tests: qemuxml2*test: switch to virRunTestLog Date: Fri, 20 Aug 2021 16:48:51 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.79 on 10.5.11.13 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629471132827100001 This essentially reverts: commit ca5c8e1dc7801854d856cfc62f2054ae753a40c3 qemuxml2argvtest: Avoid conditions in test macro Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- tests/qemustatusxml2xmltest.c | 3 +-- tests/qemuxml2argvtest.c | 10 ++-------- tests/qemuxml2xmltest.c | 9 +++------ tests/testutilsqemu.h | 1 - 4 files changed, 6 insertions(+), 17 deletions(-) diff --git a/tests/qemustatusxml2xmltest.c b/tests/qemustatusxml2xmltest.c index f6bde507a1..d58f4b69da 100644 --- a/tests/qemustatusxml2xmltest.c +++ b/tests/qemustatusxml2xmltest.c @@ -83,8 +83,7 @@ mymain(void) g_autoptr(virConnect) conn =3D NULL; struct testQemuConf testConf =3D { .capslatest =3D capslatest, .capscache =3D capscache, - .qapiSchemaCache =3D NULL, - .retptr =3D NULL }; + .qapiSchemaCache =3D NULL }; =20 if (!capslatest) return EXIT_FAILURE; diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 4ce7ed5f00..00a85988d6 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -766,8 +766,6 @@ testCompareXMLToArgv(const void *data) goto cleanup; } =20 - log =3D virTestLogContentAndReset(); - VIR_FREE(log); virResetLastError(); =20 if (!(cmd =3D testCompareXMLToArgvCreateArgs(&driver, vm, migrateURI, = info, @@ -826,9 +824,6 @@ testCompareXMLToArgv(const void *data) if (info->arch !=3D VIR_ARCH_NONE && info->arch !=3D VIR_ARCH_X86_64) qemuTestSetHostArch(&driver, VIR_ARCH_NONE); =20 - if (ret < 0) - *info->conf->retptr =3D ret; - return ret; } =20 @@ -856,8 +851,7 @@ mymain(void) g_autoptr(GHashTable) capscache =3D virHashNew(virObjectFreeHashData); struct testQemuConf testConf =3D { .capslatest =3D capslatest, .capscache =3D capscache, - .qapiSchemaCache =3D qapiSchemaCache, - .retptr =3D &ret }; + .qapiSchemaCache =3D qapiSchemaCache = }; =20 if (!capslatest) return EXIT_FAILURE; @@ -952,7 +946,7 @@ mymain(void) }; \ testQemuInfoSetArgs(&info, &testConf, __VA_ARGS__); \ testInfoSetPaths(&info, _suffix); \ - virTestRun("QEMU XML-2-ARGV " _name _suffix, testCompareXMLToArgv,= &info); \ + virTestRunLog(&ret, "QEMU XML-2-ARGV " _name _suffix, testCompareX= MLToArgv, &info); \ testQemuInfoClear(&info); \ } while (0) =20 diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 0413a130c3..6d3526f91f 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -55,7 +55,6 @@ testXML2XMLActive(const void *opaque) info->infile, info->outfile, true, info->parseFlags, TEST_COMPARE_DOM_XML2XML_RESULT_SUCCESS= ) < 0) { - *info->conf->retptr =3D -1; return -1; } =20 @@ -73,7 +72,6 @@ testXML2XMLInactive(const void *opaque) info->infile, info->outfile, false, info->parseFlags, TEST_COMPARE_DOM_XML2XML_RESULT_SUCCESS= ) < 0) { - *info->conf->retptr =3D -1; return -1; } =20 @@ -118,8 +116,7 @@ mymain(void) g_autoptr(virConnect) conn =3D NULL; struct testQemuConf testConf =3D { .capslatest =3D capslatest, .capscache =3D capscache, - .qapiSchemaCache =3D NULL, - .retptr =3D &ret }; + .qapiSchemaCache =3D NULL }; =20 if (!capslatest) return EXIT_FAILURE; @@ -168,12 +165,12 @@ mymain(void) \ if (when & WHEN_INACTIVE) { \ testInfoSetPaths(&info, suffix, WHEN_INACTIVE); \ - virTestRun("QEMU XML-2-XML-inactive " _name, testXML2XMLInacti= ve, &info); \ + virTestRunLog(&ret, "QEMU XML-2-XML-inactive " _name, testXML2= XMLInactive, &info); \ } \ \ if (when & WHEN_ACTIVE) { \ testInfoSetPaths(&info, suffix, WHEN_ACTIVE); \ - virTestRun("QEMU XML-2-XML-active " _name, testXML2XMLActive, = &info); \ + virTestRunLog(&ret, "QEMU XML-2-XML-active " _name, testXML2XM= LActive, &info); \ } \ testQemuInfoClear(&info); \ } while (0) diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h index 64562cbd1c..d59fa53239 100644 --- a/tests/testutilsqemu.h +++ b/tests/testutilsqemu.h @@ -58,7 +58,6 @@ struct testQemuConf { GHashTable *capscache; GHashTable *capslatest; GHashTable *qapiSchemaCache; - int *retptr; }; =20 struct testQemuArgs { --=20 2.31.1