From nobody Sun Feb 8 09:16:46 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.74 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1585316892; cv=none; d=zohomail.com; s=zohoarc; b=Fj/UfL+VTVjgr8i8s6CbXUKMTOm+h1o/TZnzGhIREit0Z/IlLqF2rDkRiW58Wbm1yPzcTgN9WdeV8xPHZtuGslDkpIW1uvrX/dkuUoSAoFrtzNF5ldj8qKJUYMUAqD9MwT+RocPHAgW+5vDVz60julKvGXE32K02dKWFuE4zu0c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585316892; 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=pLSaiP/wZeXX4OBQPAK4yRBVmmyJo6APBJ+/cOQLStw=; b=ASINk11ldqZ3dZM0j+vSzXuyB9emKAw6hgjKph+ejc0dpb6OKvQcsG312c3XCCIyCihifo6+dPY6UHyhBzp5ftyg0pcQT14lm09JnJjVy/G2GqvBEv/WIlvEJwkA4Ne6Oozu+xsTPPI+JdSFETPwNsQ345fjI7x4uzm1MpFf7jY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.74]) by mx.zohomail.com with SMTPS id 1585316892971579.15252507585; Fri, 27 Mar 2020 06:48: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-389-XujP--sIPQSy7ThWFxlG4Q-1; Fri, 27 Mar 2020 09:45:12 -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 AA375107ACCC; Fri, 27 Mar 2020 13:45:06 +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 67C305E03C; Fri, 27 Mar 2020 13:45:06 +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 DE2E41803516; Fri, 27 Mar 2020 13:45:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 02RDiNnE006382 for ; Fri, 27 Mar 2020 09:44:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id 90115A0A98; 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 16760CDBD5 for ; Fri, 27 Mar 2020 13:44:20 +0000 (UTC) Received: by rein.int.mamuti.net (Postfix, from userid 500) id D560318D190; 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=1585316891; 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=pLSaiP/wZeXX4OBQPAK4yRBVmmyJo6APBJ+/cOQLStw=; b=WbvrH2Dy3q1zonbY0d+8X7LUkWTRAQZeSsJAbbrUxVCTcThxyg38VAbvOSRvO9r9G9SWnR rc8myhsDQOlTOEYTpP8nRdAT2bAe/qYVnOZEFWlvQDjMBOLuJ4Gt/LsAOKgRCLx/a8zmyy wuqRdjZ/WFCM3/gZ4GszuH+E1aNOKaU= X-MC-Unique: XujP--sIPQSy7ThWFxlG4Q-1 From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 08/39] cpu_x86: Use g_auto* in x86DataToCPU Date: Fri, 27 Mar 2020 14:43:37 +0100 Message-Id: <05192fd2e107c1b7f20dfd7968dad197279de479.1585316580.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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 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 | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index fce7a2b8c5..d0ef66f1e3 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -771,9 +771,9 @@ x86DataToCPU(const virCPUx86Data *data, virCPUx86MapPtr map, virDomainCapsCPUModelPtr hvModel) { - virCPUDefPtr cpu; - virCPUx86Data copy =3D VIR_CPU_X86_DATA_INIT; - virCPUx86Data modelData =3D VIR_CPU_X86_DATA_INIT; + g_autoptr(virCPUDef) cpu =3D NULL; + g_auto(virCPUx86Data) copy =3D VIR_CPU_X86_DATA_INIT; + g_auto(virCPUx86Data) modelData =3D VIR_CPU_X86_DATA_INIT; virCPUx86VendorPtr vendor; =20 cpu =3D virCPUDefNew(); @@ -801,7 +801,7 @@ x86DataToCPU(const virCPUx86Data *data, if ((feature =3D x86FeatureFind(map, *blocker)) && !x86DataIsSubset(©, &feature->data)) if (x86DataAdd(&modelData, &feature->data) < 0) - goto error; + return NULL; } } =20 @@ -810,17 +810,9 @@ x86DataToCPU(const virCPUx86Data *data, =20 if (x86DataToCPUFeatures(cpu, VIR_CPU_FEATURE_REQUIRE, ©, map) || x86DataToCPUFeatures(cpu, VIR_CPU_FEATURE_DISABLE, &modelData, map= )) - goto error; - - cleanup: - virCPUx86DataClear(&modelData); - virCPUx86DataClear(©); - return cpu; + return NULL; =20 - error: - virCPUDefFree(cpu); - cpu =3D NULL; - goto cleanup; + return g_steal_pointer(&cpu); } =20 =20 --=20 2.26.0