From nobody Sun Feb 8 15:01:30 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=1629729452; cv=none; d=zohomail.com; s=zohoarc; b=fptd3125DPxeykNbL5VjpNMjOPO6Dp1zLXZGSl0idIyS/FwkeGL+iSL47cgtoXBDHy60eSqwnGairmpIjwrKngMbOP8fu6eMLaeZ/OkJS0jgG7RfETS/PN+cpLHTPUez+vCUmp5hB/w5/7A9b6xVwhnfxcBhuf4Rc7Ql7EZSokA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629729452; 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=TpbW7+9rQg8dKQf3a+vIPQKIYgjTDguxYLJCqAPXqnw=; b=G1upwr+6b0bHkwzDZ7d9wcL+Tqw0ruttRerJPJv29EJ/rpCHQ7wFIOYnVMXimrpuoyFL6ufXWANBphC8tZoWHPrB85kiPAH72ROIw2KYeAJjQZLq9ha0Qj6BaoYjVb2u9f8CzGds0ecIqB8bHKlNd7IakMaJBRauiobDC/zCtJ8= 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 1629729452497486.0396602894415; Mon, 23 Aug 2021 07:37:32 -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-294-oaPdk2suMPyi6bJ_akdXxw-1; Mon, 23 Aug 2021 10:37:29 -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 359CA801AC0; Mon, 23 Aug 2021 14:37:24 +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 10CDB105C86C; Mon, 23 Aug 2021 14:37:24 +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 CC8094A7C8; Mon, 23 Aug 2021 14:37:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17NEbMOF019258 for ; Mon, 23 Aug 2021 10:37:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id AF6A460861; Mon, 23 Aug 2021 14:37:22 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 39D4160854 for ; Mon, 23 Aug 2021 14:37:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629729451; 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=TpbW7+9rQg8dKQf3a+vIPQKIYgjTDguxYLJCqAPXqnw=; b=dQEkzTjaxTrqPFXC8imNHF52OAfTsjQTtN0ct6WdkbJWRRSv9ok8U+SBFXDjLhahc1KAmk YYD1G4pJnRhgQGzgbFnKKVHHkUjKW698QfIZZcVdtTQLJGw0r8ed2vcSrfLkTUzKmkNy/o TNU4mdPXhtBgzD5fpnYYbc5QnBej9r8= X-MC-Unique: oaPdk2suMPyi6bJ_akdXxw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 5/6] qemu: capabilities: use g_auto Date: Mon, 23 Aug 2021 16:37:12 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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: 1629729452929100001 Where easily possible, declare variables with g_auto to reduce the amount of calls in cleanup sections. Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_capabilities.c | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index fecd332604..4dc2a9805d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2980,10 +2980,10 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCaps *qemuCaps, virDomainVirtType virtType) { const char *model =3D virtType =3D=3D VIR_DOMAIN_VIRT_KVM ? "host" : "= max"; - qemuMonitorCPUModelInfo *modelInfo =3D NULL; - qemuMonitorCPUModelInfo *nonMigratable =3D NULL; - GHashTable *hash =3D NULL; - virCPUDef *cpu; + g_autoptr(qemuMonitorCPUModelInfo) modelInfo =3D NULL; + g_autoptr(qemuMonitorCPUModelInfo) nonMigratable =3D NULL; + g_autoptr(GHashTable) hash =3D NULL; + g_autoptr(virCPUDef) cpu =3D NULL; qemuMonitorCPUModelExpansionType type; bool fail_no_props =3D true; int ret =3D -1; @@ -3061,10 +3061,6 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCaps *qemuCaps, ret =3D 0; =20 cleanup: - virHashFree(hash); - qemuMonitorCPUModelInfoFree(nonMigratable); - qemuMonitorCPUModelInfoFree(modelInfo); - virCPUDefFree(cpu); =20 return ret; } @@ -3084,7 +3080,7 @@ virQEMUCapsGetCPUFeatures(virQEMUCaps *qemuCaps, char ***features) { qemuMonitorCPUModelInfo *modelInfo; - char **list; + g_auto(GStrv) list =3D NULL; size_t i; size_t n; int ret =3D -1; @@ -3113,7 +3109,6 @@ virQEMUCapsGetCPUFeatures(virQEMUCaps *qemuCaps, else ret =3D 0; =20 - g_strfreev(list); return ret; } =20 @@ -3499,7 +3494,7 @@ virQEMUCapsGetCPUModelX86Data(virQEMUCaps *qemuCaps, unsigned long long sigFamily =3D 0; unsigned long long sigModel =3D 0; unsigned long long sigStepping =3D 0; - virCPUData *data =3D NULL; + g_autoptr(virCPUData) data =3D NULL; virCPUData *ret =3D NULL; size_t i; =20 @@ -3547,7 +3542,6 @@ virQEMUCapsGetCPUModelX86Data(virQEMUCaps *qemuCaps, ret =3D g_steal_pointer(&data); =20 cleanup: - virCPUDataFree(data); return ret; } =20 @@ -3565,7 +3559,7 @@ virQEMUCapsInitCPUModelX86(virQEMUCaps *qemuCaps, bool migratable) { g_autoptr(virDomainCapsCPUModels) cpuModels =3D NULL; - virCPUData *data =3D NULL; + g_autoptr(virCPUData) data =3D NULL; int ret =3D -1; =20 if (!model) @@ -3582,7 +3576,6 @@ virQEMUCapsInitCPUModelX86(virQEMUCaps *qemuCaps, ret =3D 0; =20 cleanup: - virCPUDataFree(data); return ret; } =20 @@ -3769,9 +3762,9 @@ virQEMUCapsLoadHostCPUModelInfo(virQEMUCapsAccel *cap= s, { char *str =3D NULL; xmlNodePtr hostCPUNode; - xmlNodePtr *nodes =3D NULL; + g_autofree xmlNodePtr *nodes =3D NULL; VIR_XPATH_NODE_AUTORESTORE(ctxt) - qemuMonitorCPUModelInfo *hostCPU =3D NULL; + g_autoptr(qemuMonitorCPUModelInfo) hostCPU =3D NULL; g_autofree char *xpath =3D g_strdup_printf("./hostCPU[@type=3D'%s']", = typeStr); int ret =3D -1; size_t i; @@ -3881,8 +3874,6 @@ virQEMUCapsLoadHostCPUModelInfo(virQEMUCapsAccel *cap= s, =20 cleanup: VIR_FREE(str); - VIR_FREE(nodes); - qemuMonitorCPUModelInfoFree(hostCPU); return ret; } =20 @@ -4655,7 +4646,7 @@ virQEMUCapsSaveFile(void *data, void *privData G_GNUC_UNUSED) { virQEMUCaps *qemuCaps =3D data; - char *xml =3D NULL; + g_autofree char *xml =3D NULL; int ret =3D -1; =20 xml =3D virQEMUCapsFormatCache(qemuCaps); @@ -4674,7 +4665,6 @@ virQEMUCapsSaveFile(void *data, =20 ret =3D 0; cleanup: - VIR_FREE(xml); return ret; } =20 @@ -5189,7 +5179,7 @@ virQEMUCapsProbeQMPSchemaCapabilities(virQEMUCaps *qe= muCaps, { struct virQEMUCapsStringFlags *entry; virJSONValue *schemareply; - GHashTable *schema =3D NULL; + g_autoptr(GHashTable) schema =3D NULL; size_t i; =20 if (!(schemareply =3D qemuMonitorQueryQMPSchema(mon))) @@ -5214,7 +5204,6 @@ virQEMUCapsProbeQMPSchemaCapabilities(virQEMUCaps *qe= muCaps, virQEMUCapsSet(qemuCaps, entry->flag); } =20 - virHashFree(schema); return 0; } =20 @@ -5575,7 +5564,7 @@ virQEMUCapsCacheNew(const char *libDir, uid_t runUid, gid_t runGid) { - char *capsCacheDir =3D NULL; + g_autofree char *capsCacheDir =3D NULL; virFileCache *cache =3D NULL; virQEMUCapsCachePriv *priv =3D NULL; struct utsname uts; @@ -5603,7 +5592,6 @@ virQEMUCapsCacheNew(const char *libDir, priv->kernelVersion =3D g_strdup_printf("%s %s", uts.release, uts.= version); =20 cleanup: - VIR_FREE(capsCacheDir); return cache; =20 error: --=20 2.31.1