From nobody Sun Feb 8 07:14:28 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=1629729461; cv=none; d=zohomail.com; s=zohoarc; b=dDjaneh2AoyE6ydEhEIHE3hdnPYMh5ckpLmqO8KhKPGQ070apCSvOd4n32ym4E5IHJc6GC5eF8ey7H2scj+feoT6vxFJFleRx75SIrqbUb9Q6+AV8ZDOzkh4PGu/PbqOiJEv1LY6QJ4COIoT374FweG+8msbeLv/7jGfjsrD4Y4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629729461; 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=un+ECo8ej6sC4Fj99kKQCnpl+MeIqFk8MXqO+UVfG6E=; b=Mqh8r6ioRybChha2plN/r9m/0G3TKc1nx0X4bd/eI8rMi7bYmqoLAwDpHlr2mgqWRts8rRC0Bo/BSR3M6heyIaRxTLHRGs3JFnZTUCAjUspm+w0maIaLmYZ7AUzo7SSSIOMBWKKfCXya70n35WHQ1QLrBit9Cr19EF6nY62HsMw= 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 1629729461522536.4083480858235; Mon, 23 Aug 2021 07:37:41 -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-151-sIe8pHFDNsmoUPSyxn_yJw-1; Mon, 23 Aug 2021 10:37:38 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A8E65190D345; Mon, 23 Aug 2021 14:37:32 +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 7F7DC66FFF; Mon, 23 Aug 2021 14:37:32 +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 4A8644A707; Mon, 23 Aug 2021 14:37:32 +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 17NEbLda019234 for ; Mon, 23 Aug 2021 10:37:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2045360854; Mon, 23 Aug 2021 14:37:21 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9DF7D7BE5B for ; Mon, 23 Aug 2021 14:37:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629729460; 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=un+ECo8ej6sC4Fj99kKQCnpl+MeIqFk8MXqO+UVfG6E=; b=IX73SuDifgQGf9zv1jmoBJdhs77jGB6tsywbb9IcVMVQt0uoxXQ+zKQ9TWlEtjv/TsjtZN jDbcOnD4xRsFglBcf4zFTARkHkRsxOZaNwx7DPt2BRWv5GNhASs+AMU+jcve/ji1Wac2Xt JTmxKLn6mYjja/vssYKxi/4jVqS6408= X-MC-Unique: sIe8pHFDNsmoUPSyxn_yJw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 3/6] qemu: refactor virQEMUCapsInit Date: Mon, 23 Aug 2021 16:37:10 +0200 Message-Id: <4bcce17ea7accc512ed596da3704a552911cd843.1629729387.git.jtomko@redhat.com> 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.79 on 10.5.11.15 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: 1629729462118100004 Use g_auto and remove pointless labels. Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_capabilities.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a80c172d71..380d0a5694 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1111,13 +1111,13 @@ virQEMUCapsProbeHostCPU(virArch hostArch, virCaps * virQEMUCapsInit(virFileCache *cache) { - virCaps *caps; + g_autoptr(virCaps) caps =3D NULL; size_t i; virArch hostarch =3D virArchFromHost(); =20 if ((caps =3D virCapabilitiesNew(hostarch, true, true)) =3D=3D NULL) - goto error; + return NULL; =20 if (virCapabilitiesInitCaches(caps) < 0) VIR_WARN("Failed to get host CPU cache info"); @@ -1145,13 +1145,9 @@ virQEMUCapsInit(virFileCache *cache) if (virQEMUCapsInitGuest(caps, cache, hostarch, i) < 0) - goto error; + return NULL; =20 - return caps; - - error: - virObjectUnref(caps); - return NULL; + return g_steal_pointer(&caps); } =20 =20 --=20 2.31.1