From nobody Tue Feb 10 00:58:13 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1599830592; cv=none; d=zohomail.com; s=zohoarc; b=kK1gbpwirl9Rp3Na+OzJ4gf0Y1RhpQkczQ+PFjt/7uqWuszAUF7RSgj6HnyD+8cSY6mQxN0KSU84ax2DGAcS+MIoZYpAWA9wJLbcyOcWGlXdTgRKgzWI2vMzpbtigZayq3OrF3v1X2kuFZOUHrJCXxfwCuBg7vpTwOKqZBc/3Ms= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599830592; h=Content-Type:Content-Transfer-Encoding:Cc: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=w1h+y7hQ7Vsn4UMrtko+9mEbi+jvESCt9M7GP1MkzxI=; b=fpndKFKr+nwwpYnfTZetL6RKABw6jmxzC28Yqiu7thcYbUpqE07LcqsVlabx/d0aHXl2q2rVKPCBjG44foiSFCSU8zdtVhnHJ9FBugLHlXhLU2Q5F75A6LDBEEakPeuwr6ECrP1IsmH4rb6PG8de3VVevTfMJgwvehtw1w5fs9o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1599830592408531.034505317989; Fri, 11 Sep 2020 06:23: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-155-15vWnX-wOpa8TWFEWiZCEw-1; Fri, 11 Sep 2020 09:23: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 15CD480F058; Fri, 11 Sep 2020 13:23:02 +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 E592981C47; Fri, 11 Sep 2020 13:23:01 +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 ACC6A181A86E; Fri, 11 Sep 2020 13:23:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 08BDN0C3025367 for ; Fri, 11 Sep 2020 09:23:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id 445E360C47; Fri, 11 Sep 2020 13:23:00 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-163.ams2.redhat.com [10.36.112.163]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7BB2A60C15; Fri, 11 Sep 2020 13:22:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599830590; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=w1h+y7hQ7Vsn4UMrtko+9mEbi+jvESCt9M7GP1MkzxI=; b=A0D0Zm7QycVl60Vua9JdPL1iS6QpyaqCQ8XNF3pGnrucgFByWRdhMzdaZbndglx7o7Qq9q aKpSGViGFA1LyGi+sZEtJxn/saaS5qxqVK8R27oaAJcdotM9rlssEuC4lzPdrJOf/bOT7t 2jPz1iZ/DPJZiSsKBFt1Rd3AKQZ1XwE= X-MC-Unique: 15vWnX-wOpa8TWFEWiZCEw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 3/8] cpu_map: Use g_auto* in loadIncludes Date: Fri, 11 Sep 2020 15:22:44 +0200 Message-Id: <20200911132249.514503-4-twiederh@redhat.com> In-Reply-To: <20200911132249.514503-1-twiederh@redhat.com> References: <20200911132249.514503-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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.001 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: Tim Wiederhake --- src/cpu/cpu_map.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/cpu/cpu_map.c b/src/cpu/cpu_map.c index 53c8cbba6b..743547c6d1 100644 --- a/src/cpu/cpu_map.c +++ b/src/cpu/cpu_map.c @@ -125,18 +125,16 @@ loadIncludes(xmlXPathContextPtr ctxt, return -1; =20 for (i =3D 0; i < n; i++) { - char *filename =3D virXMLPropString(nodes[i], "filename"); + g_autofree char *filename =3D virXMLPropString(nodes[i], "filename= "); + if (!filename) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing 'filename' in CPU map include")); return -1; } VIR_DEBUG("Finding CPU map include '%s'", filename); - if (cpuMapLoadInclude(filename, vendorCB, featureCB, modelCB, data= ) < 0) { - VIR_FREE(filename); + if (cpuMapLoadInclude(filename, vendorCB, featureCB, modelCB, data= ) < 0) return -1; - } - VIR_FREE(filename); } =20 return 0; --=20 2.26.2