From nobody Fri Nov 21 10:13:00 2025 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=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1762873843; cv=none; d=zohomail.com; s=zohoarc; b=guTnCvgtOZ7PWyvIazg8t1ziQUjpafHwwF0yJFS6OzHhIqBR+7Edqdd0uFvojtbhY1sWdunTwdqfoU9BwyfJ5SDEDiOHe70tdO/cdTkXYBWeFdrV7k7ySM7//KSCxSCrZKKnJUxnS1VLYwbbnsDqLwBIGHfi5jemkyrsVqkVMQo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762873843; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=NRCtmvWMaMZNQHSjn7zvQ3rQCIuMwlrMzj8PO2c6jWk=; b=IJSkSUP48PczzZxw2Dsxu7935YU8fb0w8HG+46yBeyXCxMa5BG6KBuDnCWUv5HBDSJoOy92j6Ris9v+7bEt4ORJy5i5WpG6m/Ze2PjOIiD0DEzHH9LzTJYU37PoWLDvVEUl5GZfFFEb2lfQz9iABRjjj1rRsiNu3kTiMOa7GDr8= ARC-Authentication-Results: i=1; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1762873843101438.15519476613065; Tue, 11 Nov 2025 07:10:43 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 97CC9445AC; Tue, 11 Nov 2025 10:10:41 -0500 (EST) Received: from [172.19.199.29] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 487BC44C09; Tue, 11 Nov 2025 10:05:58 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 1000844970; Tue, 11 Nov 2025 10:05:42 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 96333448F4 for ; Tue, 11 Nov 2025 10:05:31 -0500 (EST) Received: from mx-prod-mc-05.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-494-YGeYv-TXM5qtrPMSx86_0Q-1; Tue, 11 Nov 2025 10:05:30 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 30E401955E9E for ; Tue, 11 Nov 2025 15:05:29 +0000 (UTC) Received: from kshcheti-thinkpadp1gen4i.tpbc.csb (unknown [10.43.3.60]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 44E6319560A2; Tue, 11 Nov 2025 15:05:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1762873531; h=from:from: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; bh=NRCtmvWMaMZNQHSjn7zvQ3rQCIuMwlrMzj8PO2c6jWk=; b=VU/vHqbKiTKxTJaba/feTZjz10I+em6SWHPSZQTK0BHCNJT87vuPdzMbrgRPCOYm+xsbmp oUpWprdf8wD6YdjN7YtPlBdEztj1rfVUK/t83Jud/ZWdXT4xGbK5xuIc54J8Bi+62H4Qfn V0cngajQdCZl0ljklogwSojbQA6xx3Q= X-MC-Unique: YGeYv-TXM5qtrPMSx86_0Q-1 X-Mimecast-MFC-AGG-ID: YGeYv-TXM5qtrPMSx86_0Q_1762873529 To: devel@lists.libvirt.org Subject: [PATCH 4/7] qemuDomainSetVcpusAgent: Use automatic memory management Date: Tue, 11 Nov 2025 16:01:43 +0100 Message-ID: <20251111150508.257647-5-kshcheti@redhat.com> In-Reply-To: <20251111150508.257647-1-kshcheti@redhat.com> References: <20251111150508.257647-1-kshcheti@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Xx01CrJqsIGlLZl3As6A044zNrLKXa6pGLsPOlAgCKE_1762873529 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: KQW5VNWGRBVXXPTT4W2VYHI7TQLCNXVB X-Message-ID-Hash: KQW5VNWGRBVXXPTT4W2VYHI7TQLCNXVB X-MailFrom: kshcheti@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Kirill Shchetiniuk X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Kirill Shchetiniuk via Devel Reply-To: Kirill Shchetiniuk X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1762873847171153000 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Kirill Shchetiniuk Use auto memory management, no more cleanup stage required Signed-off-by: Kirill Shchetiniuk --- src/qemu/qemu_driver.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 12a1b2ae9d..6ee54f95a4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4140,19 +4140,19 @@ static int qemuDomainSetVcpusAgent(virDomainObj *vm, unsigned int nvcpus) { - qemuAgentCPUInfo *cpuinfo =3D NULL; + g_autofree qemuAgentCPUInfo *cpuinfo =3D NULL; qemuAgent *agent; int ncpuinfo; int ret =3D -1; =20 if (!qemuDomainAgentAvailable(vm, true)) - goto cleanup; + return -1; =20 if (nvcpus > virDomainDefGetVcpus(vm->def)) { virReportError(VIR_ERR_INVALID_ARG, _("requested vcpu count is greater than the count o= f enabled vcpus in the domain: %1$d > %2$d"), nvcpus, virDomainDefGetVcpus(vm->def)); - goto cleanup; + return -1; } =20 agent =3D qemuDomainObjEnterAgent(vm); @@ -4161,21 +4161,18 @@ qemuDomainSetVcpusAgent(virDomainObj *vm, agent =3D NULL; =20 if (ncpuinfo < 0) - goto cleanup; + return -1; =20 if (qemuAgentUpdateCPUInfo(nvcpus, cpuinfo, ncpuinfo) < 0) - goto cleanup; + return -1; =20 if (!qemuDomainAgentAvailable(vm, true)) - goto cleanup; + return -1; =20 agent =3D qemuDomainObjEnterAgent(vm); ret =3D qemuAgentSetVCPUs(agent, cpuinfo, ncpuinfo); qemuDomainObjExitAgent(vm, agent); =20 - cleanup: - VIR_FREE(cpuinfo); - return ret; } =20 --=20 2.49.0