From nobody Sun Feb 8 10:03:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) client-ip=216.205.24.74; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-74.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 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=1585316900; cv=none; d=zohomail.com; s=zohoarc; b=cYa8YiQP7yywwdhthnJ5jwd7eeK9UrxhkrlDdPrDQW05SsWOaNEmKkrhyBWGxwNM77qqp2LAz7kTrkQUuvKykaHaRPTHhGcoziJxJlajaD2dnRHnZIvGg1ZOHo238dlX9AqEs9A0GHSbg9NZY8gKUOqnPdA+iWEaDZ83/E8+6Rs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585316900; 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=CxpLTXyG8C6CSt0M2N1m3citRphfqRUx7dy9g/p3NZg=; b=Y8OeqQC6MvayPiKpzLohddPJq238njSCYC/2zsRx0Ba7/e0ARL83WQI2XvcQKccei/XGhsrftfNqy1HAIOO+ph/+yV+ZxaCtz+sumq8VpGIygW8QCtfxlYAWll1Pgoh/kOnue+OBRtDRGVQc/6e0eW7jwgrdzWnzTwGxvN//p6U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-74.mimecast.com (us-smtp-delivery-74.mimecast.com [216.205.24.74]) by mx.zohomail.com with SMTPS id 1585316900726219.14693896352878; Fri, 27 Mar 2020 06:48:20 -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-269-9zaRXvYdOBqpPO11nmxOxA-1; Fri, 27 Mar 2020 09:45:07 -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 90390149C3; Fri, 27 Mar 2020 13:44:57 +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 667F35C3FA; Fri, 27 Mar 2020 13:44:57 +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 1B68218034FA; Fri, 27 Mar 2020 13:44:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 02RDiNRf006339 for ; Fri, 27 Mar 2020 09:44:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4E7375DA75; Fri, 27 Mar 2020 13:44:23 +0000 (UTC) Received: from rein.int.mamuti.net (unknown [10.40.192.72]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1C70C5DA2C for ; Fri, 27 Mar 2020 13:44:20 +0000 (UTC) Received: by rein.int.mamuti.net (Postfix, from userid 500) id E721618D5A9; Fri, 27 Mar 2020 14:44:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585316899; 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=CxpLTXyG8C6CSt0M2N1m3citRphfqRUx7dy9g/p3NZg=; b=iYsZYk7JHOX82cFXQyBqqpTdhfSqDgq3TRTx2b7Ciy4coxkf6Tj1ApSEx1Q7TkUvHi5LGD as01Fp3Cd6yETfMszise+qoJFdGUSMFAA86/gEGsW9b3qH4kpT3oKiVMG5x0smROG6zmF4 PRSwz3Q/0Aky2Xkx0E+qiF2UgdLI1V0= X-MC-Unique: 9zaRXvYdOBqpPO11nmxOxA-1 From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 14/39] cpu_x86: Use g_auto* in virCPUx86DataParse Date: Fri, 27 Mar 2020 14:43:43 +0100 Message-Id: <486aca441933d1ab2fb5a6fe5bc3159e10d2a5aa.1585316580.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark Reviewed-by: J=C3=A1n Tomko --- src/cpu/cpu_x86.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index ba269df66d..6c3f9fc0be 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -1636,8 +1636,8 @@ virCPUx86DataFormat(const virCPUData *data) static virCPUDataPtr virCPUx86DataParse(xmlXPathContextPtr ctxt) { - xmlNodePtr *nodes =3D NULL; - virCPUDataPtr cpuData =3D NULL; + g_autofree xmlNodePtr *nodes =3D NULL; + g_autoptr(virCPUData) cpuData =3D NULL; virCPUx86DataItem item; size_t i; int n; @@ -1646,11 +1646,11 @@ virCPUx86DataParse(xmlXPathContextPtr ctxt) if (n <=3D 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no x86 CPU data found")); - goto error; + return NULL; } =20 if (!(cpuData =3D virCPUDataNew(VIR_ARCH_X86_64))) - goto error; + return NULL; =20 for (i =3D 0; i < n; i++) { ctxt->node =3D nodes[i]; @@ -1658,28 +1658,21 @@ virCPUx86DataParse(xmlXPathContextPtr ctxt) if (x86ParseCPUID(ctxt, &item) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to parse cpuid[%zu]"), i); - goto error; + return NULL; } } else { if (x86ParseMSR(ctxt, &item) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to parse msr[%zu]"), i); - goto error; + return NULL; } } =20 if (virCPUx86DataAdd(cpuData, &item) < 0) - goto error; + return NULL; } =20 - cleanup: - VIR_FREE(nodes); - return cpuData; - - error: - virCPUx86DataFree(cpuData); - cpuData =3D NULL; - goto cleanup; + return g_steal_pointer(&cpuData); } =20 =20 --=20 2.26.0