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=1762873745; cv=none; d=zohomail.com; s=zohoarc; b=PLYNHxx4DzWMzltS3HmiboZOSMxeCMm1XK0j90bPrgo7sHlCNh+ONiBmdU+4Otb/c8h2HkKHvnkcar5Kj2RSsmnubqziJbsHRtTx2PeDjdhXNUDDwrLi3TZnshYaFWeqau4SpUvjoFDRW8CbIzBVJrQZJMsTcBpYDmKrv2/li+E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762873745; 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=zN7rQ5K3/35Tf5BW+RCI/s3R/DgLWc9WVRglyMDdqQw=; b=fC1p22/oXj3NEbDKQnYp9RljGfr+jraOx9frPEyrp7tvrsTIxQaNiYk1SWcvgDBCLHvswHvaqNErTmPmzFJNbziflDOQLsjPt50999wpCHEzu3VEG2qg3srVDqnBy2teOK9F4h/BiDEOX+WAEDTuv1XXeD++jLo7qrGeWocYC1g= 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 17628737451521.5176017874215404; Tue, 11 Nov 2025 07:09:05 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 07A64445D4; Tue, 11 Nov 2025 10:09:00 -0500 (EST) Received: from [172.19.199.29] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id EEE2A44B9E; Tue, 11 Nov 2025 10:05:46 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id EB81744006; Tue, 11 Nov 2025 10:05:29 -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 E06D444049 for ; Tue, 11 Nov 2025 10:05:28 -0500 (EST) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-364-BOhgUUZYNaS7q-uNEqZW4g-1; Tue, 11 Nov 2025 10:05:27 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5FCCD180045C for ; Tue, 11 Nov 2025 15:05:26 +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 0ED1419560A2; Tue, 11 Nov 2025 15:05:24 +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=1762873528; 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=zN7rQ5K3/35Tf5BW+RCI/s3R/DgLWc9WVRglyMDdqQw=; b=bGD3hptMiBUk7zD/SfM4rZ3CgrKbo3uQxtUfAYXFtqj5xFGSc3TpfAFFwqGwAY2emNtyVv Z3KFI9SCKymFYYHZVHOrgMq+g7NQZ9i+FPanGedNcUsVlwbT/jFtqlRCCOMQHI7/UCy5tm SclfL+P4AKlcFtGObkg6qBIYoMEvPBQ= X-MC-Unique: BOhgUUZYNaS7q-uNEqZW4g-1 X-Mimecast-MFC-AGG-ID: BOhgUUZYNaS7q-uNEqZW4g_1762873526 To: devel@lists.libvirt.org Subject: [PATCH 2/7] qemu: Use automatic memory management Date: Tue, 11 Nov 2025 16:01:41 +0100 Message-ID: <20251111150508.257647-3-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: tsORxmJbSabw-2qW9GMrL5C8rZbW49LFJOPgeeqXs90_1762873526 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ONO2LSDK5IKDU5RT6ACLEM2IYAHQDASH X-Message-ID-Hash: ONO2LSDK5IKDU5RT6ACLEM2IYAHQDASH 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: 1762873751203153000 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Kirill Shchetiniuk Signed-off-by: Kirill Shchetiniuk --- src/qemu/qemu_domain.c | 15 ++++++--------- src/qemu/qemu_driver.c | 6 ++---- src/qemu/qemu_migration.c | 25 +++++++++---------------- src/qemu/qemu_monitor.c | 6 ++---- 4 files changed, 19 insertions(+), 33 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a42721efad..1fb469e964 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -566,7 +566,7 @@ qemuDomainMasterKeyReadFile(qemuDomainObjPrivate *priv) { g_autofree char *path =3D NULL; int fd =3D -1; - uint8_t *masterKey =3D NULL; + g_autofree uint8_t *masterKey =3D NULL; ssize_t masterKeyLen =3D 0; =20 if (!(path =3D qemuDomainGetMasterKeyFilePath(priv->libDir))) @@ -601,7 +601,7 @@ qemuDomainMasterKeyReadFile(qemuDomainObjPrivate *priv) =20 masterKey =3D g_renew(uint8_t, masterKey, masterKeyLen); =20 - priv->masterKey =3D masterKey; + priv->masterKey =3D g_steal_pointer(&masterKey); priv->masterKeyLen =3D masterKeyLen; =20 VIR_FORCE_CLOSE(fd); @@ -609,9 +609,7 @@ qemuDomainMasterKeyReadFile(qemuDomainObjPrivate *priv) return 0; =20 error: - if (masterKeyLen > 0) - memset(masterKey, 0, masterKeyLen); - VIR_FREE(masterKey); + virSecureErase(masterKey, masterKeyLen); =20 VIR_FORCE_CLOSE(fd); =20 @@ -3322,7 +3320,7 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, { qemuDomainObjPrivate *priv =3D vm->privateData; virQEMUDriver *driver =3D config->priv; - char *monitorpath; + g_autofree char *monitorpath =3D NULL; g_autofree char *tmp =3D NULL; int n; size_t i; @@ -3349,13 +3347,12 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctx= t, =20 switch (priv->monConfig->type) { case VIR_DOMAIN_CHR_TYPE_PTY: - priv->monConfig->data.file.path =3D monitorpath; + priv->monConfig->data.file.path =3D g_steal_pointer(&monitorpath); break; case VIR_DOMAIN_CHR_TYPE_UNIX: - priv->monConfig->data.nix.path =3D monitorpath; + priv->monConfig->data.nix.path =3D g_steal_pointer(&monitorpath); break; default: - VIR_FREE(monitorpath); virReportError(VIR_ERR_INTERNAL_ERROR, _("unsupported monitor type '%1$s'"), virDomainChrTypeToString(priv->monConfig->type)); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a1b1edcbbf..12a1b2ae9d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18858,7 +18858,7 @@ qemuDomainGetGuestVcpus(virDomainPtr dom, { virDomainObj *vm =3D NULL; qemuAgent *agent; - qemuAgentCPUInfo *info =3D NULL; + g_autofree qemuAgentCPUInfo *info =3D NULL; int ninfo =3D 0; int ret =3D -1; =20 @@ -18892,7 +18892,6 @@ qemuDomainGetGuestVcpus(virDomainPtr dom, virDomainObjEndAgentJob(vm); =20 cleanup: - VIR_FREE(info); virDomainObjEndAPI(&vm); return ret; } @@ -18906,7 +18905,7 @@ qemuDomainSetGuestVcpus(virDomainPtr dom, { virDomainObj *vm =3D NULL; g_autoptr(virBitmap) map =3D NULL; - qemuAgentCPUInfo *info =3D NULL; + g_autofree qemuAgentCPUInfo *info =3D NULL; qemuAgent *agent; int ninfo =3D 0; size_t i; @@ -18976,7 +18975,6 @@ qemuDomainSetGuestVcpus(virDomainPtr dom, virDomainObjEndAgentJob(vm); =20 cleanup: - VIR_FREE(info); virDomainObjEndAPI(&vm); return ret; } diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 9109c4526d..fd050641c7 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3852,7 +3852,7 @@ qemuMigrationDstPrepareTunnel(virQEMUDriver *driver, static virURI * qemuMigrationAnyParseURI(const char *uri, bool *wellFormed) { - char *tmp =3D NULL; + g_autofree char *tmp =3D NULL; virURI *parsed; =20 /* For compatibility reasons tcp://... URIs are sent as tcp:... @@ -3865,7 +3865,6 @@ qemuMigrationAnyParseURI(const char *uri, bool *wellF= ormed) parsed =3D virURIParse(uri); if (parsed && wellFormed) *wellFormed =3D !tmp; - VIR_FREE(tmp); =20 return parsed; } @@ -4044,18 +4043,16 @@ qemuMigrationAnyPrepareDef(virQEMUDriver *driver, if (!(def =3D virDomainDefParseString(dom_xml, driver->xmlopt, qemuCaps, VIR_DOMAIN_DEF_PARSE_INACTIVE))) - goto cleanup; + return NULL; =20 if (dname) { name =3D def->name; def->name =3D g_strdup(dname); } =20 - cleanup: - if (def && origname) - *origname =3D name; - else - VIR_FREE(name); + if (origname) + *origname =3D g_steal_pointer(&name); + return def; } =20 @@ -4331,7 +4328,7 @@ struct _qemuMigrationIOThread { static void qemuMigrationSrcIOFunc(void *arg) { qemuMigrationIOThread *data =3D arg; - char *buffer =3D NULL; + g_autofree char *buffer =3D NULL; struct pollfd fds[2]; int timeout =3D -1; virErrorPtr err =3D NULL; @@ -4409,7 +4406,6 @@ static void qemuMigrationSrcIOFunc(void *arg) goto error; =20 VIR_FORCE_CLOSE(data->sock); - VIR_FREE(buffer); =20 return; =20 @@ -4428,7 +4424,6 @@ static void qemuMigrationSrcIOFunc(void *arg) if (!virLastErrorIsSystemErrno(EPIPE)) virCopyLastError(&data->err); virResetLastError(); - VIR_FREE(buffer); } =20 =20 @@ -4436,7 +4431,7 @@ static qemuMigrationIOThread * qemuMigrationSrcStartTunnel(virStreamPtr st, int sock) { - qemuMigrationIOThread *io =3D NULL; + g_autofree qemuMigrationIOThread *io =3D NULL; int wakeupFD[2] =3D { -1, -1 }; =20 if (virPipe(wakeupFD) < 0) @@ -4459,12 +4454,11 @@ qemuMigrationSrcStartTunnel(virStreamPtr st, goto error; } =20 - return io; + return g_steal_pointer(&io); =20 error: VIR_FORCE_CLOSE(wakeupFD[0]); VIR_FORCE_CLOSE(wakeupFD[1]); - VIR_FREE(io); return NULL; } =20 @@ -7131,7 +7125,7 @@ qemuMigrationSrcToLegacyFile(virQEMUDriver *driver, qemuDomainObjPrivate *priv =3D vm->privateData; int ret =3D -1; int pipeFD[2] =3D { -1, -1 }; - char *errbuf =3D NULL; + g_autofree char *errbuf =3D NULL; =20 if (compressor && virPipe(pipeFD) < 0) return -1; @@ -7177,7 +7171,6 @@ qemuMigrationSrcToLegacyFile(virQEMUDriver *driver, =20 if (errbuf) { VIR_DEBUG("Compression binary stderr: %s", NULLSTR(errbuf)); - VIR_FREE(errbuf); } =20 return ret; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 0f1a9d13f5..b6b606963d 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -890,7 +890,7 @@ qemuMonitorInitBalloonObjectPath(qemuMonitor *mon, virDomainMemballoonDef *balloon) { ssize_t i, nprops =3D 0; - char *path =3D NULL; + g_autofree char *path =3D NULL; const char *name; qemuMonitorJSONListPath **bprops =3D NULL; =20 @@ -970,7 +970,6 @@ qemuMonitorInitBalloonObjectPath(qemuMonitor *mon, for (i =3D 0; i < nprops; i++) qemuMonitorJSONListPathFree(bprops[i]); VIR_FREE(bprops); - VIR_FREE(path); return; } =20 @@ -2341,7 +2340,7 @@ qemuMonitorMigrateToHost(qemuMonitor *mon, int port) { int ret; - char *uri =3D NULL; + g_autofree char *uri =3D NULL; VIR_DEBUG("hostname=3D%s port=3D%d flags=3D0x%x", hostname, port, flag= s); =20 QEMU_CHECK_MONITOR(mon); @@ -2352,7 +2351,6 @@ qemuMonitorMigrateToHost(qemuMonitor *mon, =20 ret =3D qemuMonitorJSONMigrate(mon, flags, uri); =20 - VIR_FREE(uri); return ret; } =20 --=20 2.49.0