From nobody Sun Feb 8 14:26:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1729190614462462.3468258556288; Thu, 17 Oct 2024 11:43:34 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 520B9137B; Thu, 17 Oct 2024 14:43:33 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 6814F14BE; Thu, 17 Oct 2024 14:40:21 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 7D62B144C; Thu, 17 Oct 2024 14:40:18 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 45FD714C4 for ; Thu, 17 Oct 2024 14:40:08 -0400 (EDT) Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-679-L_vh12AcNceg2iYEPCOj3w-1; Thu, 17 Oct 2024 14:40:06 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 38CFF19560B7 for ; Thu, 17 Oct 2024 18:40:06 +0000 (UTC) Received: from orkuz (unknown [10.45.224.13]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B5E041956086 for ; Thu, 17 Oct 2024 18:40:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: *** X-Spam-Status: No, score=3.0 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_NONE autolearn=no autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729190407; h=from:from: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; bh=ExnQryShk8bWfgKfGRMiGcoCXCog3Q9DcfmqBkq38wM=; b=WIokZSTyofmLfm4CpTdzMopqgGdsX8s7gqrA3BWeLHFepsH9lZrMleCtYeovyswvm3IaVN iyr3JdTmNJAIlJ3LRRvKossHoU08Sg6Afy9yXh+L48c4kjQrmgOMq7FWmqQ2Lz5CCaMOlb ao+UJFau3wbolZaCK4k1LmsgihYyZMs= X-MC-Unique: L_vh12AcNceg2iYEPCOj3w-1 From: Jiri Denemark To: devel@lists.libvirt.org Subject: [PATCH 4/9] qemu: Use g_autoptr in qemuConnectCompareHypervisorCPU Date: Thu, 17 Oct 2024 20:39:50 +0200 Message-ID: <9bec9be3d4e50835e2fb1e3551c16f5026f3c139.1729190350.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ZYUCAHCRLP2C4Q4ZFRV7U73NSHIJRVP2 X-Message-ID-Hash: ZYUCAHCRLP2C4Q4ZFRV7U73NSHIJRVP2 X-MailFrom: jdenemar@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1729190615827116600 Content-Type: text/plain; charset="utf-8" Let's get rid of the only explicitly freed variable left in qemuConnectCompareHypervisorCPU. Signed-off-by: Jiri Denemark --- src/qemu/qemu_driver.c | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f27c21ca8c..62a44bf6e7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11597,14 +11597,13 @@ qemuConnectCompareHypervisorCPU(virConnectPtr con= n, const char *xmlCPU, unsigned int flags) { - int ret =3D VIR_CPU_COMPARE_ERROR; virQEMUDriver *driver =3D conn->privateData; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); g_autoptr(virQEMUCaps) qemuCaps =3D NULL; bool failIncompatible; bool validateXML; virCPUDef *hvCPU; - virCPUDef *cpu =3D NULL; + g_autoptr(virCPUDef) cpu =3D NULL; virArch arch; virDomainVirtType virttype; =20 @@ -11613,7 +11612,7 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn, VIR_CPU_COMPARE_ERROR); =20 if (virConnectCompareHypervisorCPUEnsureACL(conn) < 0) - goto cleanup; + return VIR_CPU_COMPARE_ERROR; =20 failIncompatible =3D !!(flags & VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATI= BLE); validateXML =3D !!(flags & VIR_CONNECT_COMPARE_CPU_VALIDATE_XML); @@ -11625,7 +11624,7 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn, machine, &arch, &virttype, NULL); if (!qemuCaps) - goto cleanup; + return VIR_CPU_COMPARE_ERROR; =20 hvCPU =3D virQEMUCapsGetHostModel(qemuCaps, virttype, VIR_QEMU_CAPS_HOST_CPU_REPORTED); @@ -11635,17 +11634,19 @@ qemuConnectCompareHypervisorCPU(virConnectPtr con= n, _("QEMU '%1$s' does not support reporting CPU model= for virttype '%2$s'"), virQEMUCapsGetBinary(qemuCaps), virDomainVirtTypeToString(virttype)); - goto cleanup; + return VIR_CPU_COMPARE_ERROR; } =20 if (ARCH_IS_X86(arch)) { - ret =3D virCPUCompareXML(arch, hvCPU, xmlCPU, failIncompatible, - validateXML); - } else if (ARCH_IS_S390(arch) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_COMPARIS= ON)) { + return virCPUCompareXML(arch, hvCPU, xmlCPU, failIncompatible, + validateXML); + } + + if (ARCH_IS_S390(arch) && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_COMPARISON)) { if (virCPUDefParseXMLString(xmlCPU, VIR_CPU_TYPE_AUTO, &cpu, validateXML) < 0) - goto cleanup; + return VIR_CPU_COMPARE_ERROR; =20 if (!cpu->model) { if (cpu->mode =3D=3D VIR_CPU_MODE_HOST_PASSTHROUGH) { @@ -11655,21 +11656,18 @@ qemuConnectCompareHypervisorCPU(virConnectPtr con= n, } else { virReportError(VIR_ERR_INVALID_ARG, "%s", _("cpu parameter is missing a model name")); - goto cleanup; + return VIR_CPU_COMPARE_ERROR; } } - ret =3D qemuConnectCPUModelComparison(qemuCaps, cfg->libDir, - cfg->user, cfg->group, - hvCPU, cpu, failIncompatible); - } else { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("comparing with the hypervisor CPU is not support= ed for arch %1$s"), - virArchToString(arch)); + return qemuConnectCPUModelComparison(qemuCaps, cfg->libDir, + cfg->user, cfg->group, + hvCPU, cpu, failIncompatible); } =20 - cleanup: - virCPUDefFree(cpu); - return ret; + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("comparing with the hypervisor CPU is not supported f= or arch %1$s"), + virArchToString(arch)); + return VIR_CPU_COMPARE_ERROR; } =20 =20 --=20 2.47.0