From nobody Sun Feb 8 20:59:06 2026 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 --- 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