From nobody Fri Dec 12 14:07:42 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=1764073477; cv=none; d=zohomail.com; s=zohoarc; b=JKQZOlcgJMOCK1NktdO+MlyYjxKFV9191WdLatLrI7JD495QLw9dA3qnFe1gzGWJap8g8Doq8uTLvjqB/oB6n2dJEyggm9BjVc4LV32PNnDPiy+jSb5OlIP7BTUHDQkTR/+yRBCSADRJsVqvpoE0NmFemmH2P+ALe9FxdJw3UFk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764073477; 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=SBMUgTsygKS1o1yrEgeZc7SdUhSexvRFdgmN0//B0T8=; b=bxo2HsOg5Ecbwe4XVE+Gj5uRkQrI6GEpXgIv79B/igby9AB+UdN7kklCbLRiN77uzbEpfuOXQqoQd/pPf1v+qzHzNMbH+3AL45DUx3GYztT5leIF6/xSGXsAvMctnR4qoxBybcI0k4I9ttEPqR00Ed4oPkCjtPeek/RQIm69U4A= 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 1764073477330930.8017864567632; Tue, 25 Nov 2025 04:24:37 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id A6B95419AA; Tue, 25 Nov 2025 07:24:35 -0500 (EST) Received: from [172.19.199.68] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 7502A44BD2; Tue, 25 Nov 2025 07:18:42 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id AA323447A8; Tue, 25 Nov 2025 07:18:30 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 DD73E447A8 for ; Tue, 25 Nov 2025 07:18:18 -0500 (EST) Received: from mx-prod-mc-06.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-641-IBYRq5TRMfyhpqqWnDx2mw-1; Tue, 25 Nov 2025 07:18:17 -0500 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C929118001FE for ; Tue, 25 Nov 2025 12:18:16 +0000 (UTC) Received: from kshcheti-thinkpadp1gen4i.tpbc.csb (unknown [10.43.3.229]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F4171180047F; Tue, 25 Nov 2025 12:18:15 +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=1764073098; 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=SBMUgTsygKS1o1yrEgeZc7SdUhSexvRFdgmN0//B0T8=; b=h3QltWLYjC5UfN8KCUXbpHlWeIpHo4lctgvezFfdJcpbVOdMiypMCTkzVoiIcfPrO246AZ qydzVoYbUyTseUh0pFQY4Box9kbu4xYIxMZXzquSyycSxbF84JeHFlhT1KbtqT1frOd+/f EgVTb2KBXFbvXdDvVbmEDBAOz6aZtJs= X-MC-Unique: IBYRq5TRMfyhpqqWnDx2mw-1 X-Mimecast-MFC-AGG-ID: IBYRq5TRMfyhpqqWnDx2mw_1764073096 To: devel@lists.libvirt.org Subject: [PATCH v2 05/22] qemuMigrationSrcPerformPeer2Peer2: Use automatic memory management Date: Tue, 25 Nov 2025 13:11:35 +0100 Message-ID: <20251125121753.444490-6-kshcheti@redhat.com> In-Reply-To: <20251125121753.444490-1-kshcheti@redhat.com> References: <20251125121753.444490-1-kshcheti@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Q-jmh6enhwDfdFJ-NDhPouf1XLclZsUDGmNLfqwW-0I_1764073096 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: RDWE6CAZ4E4TK2SXW2OZ6DAU45LO3BEO X-Message-ID-Hash: RDWE6CAZ4E4TK2SXW2OZ6DAU45LO3BEO 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: 1764073478114019200 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Kirill Shchetiniuk Defined glib cleanup function for virStream object type and enabled the automatic memory management Signed-off-by: Kirill Shchetiniuk --- src/datatypes.h | 1 + src/qemu/qemu_migration.c | 14 +++++--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/datatypes.h b/src/datatypes.h index c5a7ece786..8dd4d87572 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -746,6 +746,7 @@ struct _virStream { virFreeCallback ff; }; =20 +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virStream, virObjectUnref); =20 /** * _virDomainCheckpoint diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 9059f9aa3a..881133caed 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -5564,13 +5564,13 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriver *dr= iver, qemuMigrationParams *migParams) { virDomainPtr ddomain =3D NULL; - char *uri_out =3D NULL; - char *cookie =3D NULL; - char *dom_xml =3D NULL; + g_autofree char *uri_out =3D NULL; + g_autofree char *cookie =3D NULL; + g_autofree char *dom_xml =3D NULL; int cookielen =3D 0, ret; virErrorPtr orig_err =3D NULL; bool cancelled; - virStreamPtr st =3D NULL; + g_autoptr(virStream) st =3D NULL; unsigned long destflags; =20 VIR_DEBUG("driver=3D%p, sconn=3D%p, dconn=3D%p, vm=3D%p, dconnuri=3D%s= , " @@ -5616,7 +5616,7 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriver *driv= er, if (qemuDomainObjExitRemote(vm, true) < 0) goto cleanup; } - VIR_FREE(dom_xml); + if (ret =3D=3D -1) goto cleanup; =20 @@ -5680,11 +5680,7 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriver *dri= ver, ret =3D -1; } =20 - virObjectUnref(st); - virErrorRestore(&orig_err); - VIR_FREE(uri_out); - VIR_FREE(cookie); =20 return ret; } --=20 2.49.0