From nobody Mon Dec 15 12:04:27 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=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 1741873529116201.90682671842399; Thu, 13 Mar 2025 06:45:29 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 7CAB71F44; Thu, 13 Mar 2025 09:45:28 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id BE3661F35; Thu, 13 Mar 2025 09:44:48 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 0482A1EA0; Thu, 13 Mar 2025 09:44:45 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 836281EA0 for ; Thu, 13 Mar 2025 09:44:44 -0400 (EDT) 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-458-6gGehfgiMZieNvstwaFMAQ-1; Thu, 13 Mar 2025 09:44:43 -0400 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 455AB195609E for ; Thu, 13 Mar 2025 13:44:42 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.3.236]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 935D41944EAA for ; Thu, 13 Mar 2025 13:44:41 +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=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741873484; 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=o3NwvNtW7bf/UHAokEUsK1duIm9jH/wr3FhV22txty0=; b=Njll563F1OblSLbnkz1Zz3B6SfWgMqd1XPZNLAyh781BAC5QcJ5saSNvcoTz60/kGTJcMc bQSEYMXeGfPmPJLMtWMogo4+R69z2imU/zGWnJN60/flWia4RZbrDHG4aOkajqmgyYGrL/ cMkwDPRMlZzgv7+vE1UQPyUKrq8+ONc= X-MC-Unique: 6gGehfgiMZieNvstwaFMAQ-1 X-Mimecast-MFC-AGG-ID: 6gGehfgiMZieNvstwaFMAQ_1741873482 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 1/6] network: Free inhibitor in networkStateCleanup() Date: Thu, 13 Mar 2025 14:44:33 +0100 Message-ID: <628716f08d6cd664ad3240defae8e52a1262643e.1741873456.git.mprivozn@redhat.com> In-Reply-To: References: 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: DFZbPTG1mMdrnRMZk77AU0TNbVZf55tG9bhHfk0AYkM_1741873482 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: EE5JPIJCZHUFBWRUB4DF7YLTGC2JSMY3 X-Message-ID-Hash: EE5JPIJCZHUFBWRUB4DF7YLTGC2JSMY3 X-MailFrom: mprivozn@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: 1741873532240019000 Content-Type: text/plain; charset="utf-8"; x-default="true" The shutdown inhibitor is created in networkStateInitialize() but corresponding call to virInhibitorFree() is missing in networkStateCleanup() leading to a memleak: 116 (72 direct, 44 indirect) bytes in 1 blocks are definitely lost in loss = record 1,769 of 1,998 at 0x484CEF3: calloc (vg_replace_malloc.c:1675) by 0x4F0E7A9: g_malloc0 (in /usr/lib64/libglib-2.0.so.0.8000.5) by 0x4993B9B: virInhibitorNew (virinhibitor.c:152) by 0x5279394: networkStateInitialize (bridge_driver.c:654) by 0x4CC74DC: virStateInitialize (libvirt.c:665) by 0x15B719: daemonRunStateInit (remote_daemon.c:613) by 0x49F2B44: virThreadHelper (virthread.c:256) by 0x5356662: start_thread (in /usr/lib64/libc.so.6) by 0x53D7DA3: clone (in /usr/lib64/libc.so.6) Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- src/network/bridge_driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 80d2c3a1d5..2cad1c8cbe 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -802,6 +802,8 @@ networkStateCleanup(void) network_driver->lockFD); } =20 + virInhibitorFree(network_driver->inhibitor); + virObjectUnref(network_driver->config); virObjectUnref(network_driver->dnsmasqCaps); =20 --=20 2.48.1 From nobody Mon Dec 15 12:04:27 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=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 1741873549875788.5279643814545; Thu, 13 Mar 2025 06:45:49 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id D32061F5C; Thu, 13 Mar 2025 09:45:48 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id B6C08212B; Thu, 13 Mar 2025 09:44:51 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 5156C1D9F; Thu, 13 Mar 2025 09:44:46 -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 C920E1A7F for ; Thu, 13 Mar 2025 09:44:45 -0400 (EDT) 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-413-Nc_bJsxVNLejz9e-TR1UWg-1; Thu, 13 Mar 2025 09:44:44 -0400 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5C1D51800262 for ; Thu, 13 Mar 2025 13:44:43 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.3.236]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id AA60F1955BCB for ; Thu, 13 Mar 2025 13:44:42 +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=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741873485; 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=yovSbnUk/nnX3LtbeTtUPai/XzB/VpOZPQ2cGFsRAdw=; b=ZTSEx0emuF7/6udIn6qqtxX2HEF3J1pWVrZ9EbuNlsdZvunATU/XOdOoaft2fNY+qtN1gi hGUTYvNOS0kO9zdbcn/0Bd3jgvxQH0fyInVGZ25/3BHeH3vaimwAiwBSgcMXWYEClUud6p 5/z5Pn5xwgF/xvtMr0A3KY/J2TTPoN4= X-MC-Unique: Nc_bJsxVNLejz9e-TR1UWg-1 X-Mimecast-MFC-AGG-ID: Nc_bJsxVNLejz9e-TR1UWg_1741873483 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 2/6] ch: Free retval of curl_slist_append() Date: Thu, 13 Mar 2025 14:44:34 +0100 Message-ID: <08fe521d921e57e53a21d4aed5160ff464c1d484.1741873456.git.mprivozn@redhat.com> In-Reply-To: References: 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: 9Dah_M4nuRdhhYOasxsQwmRS7qUSPtpQTJbv_tgPHrM_1741873483 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: L7AA5WPCNQRVXWU6WWY5PH7LXQXWJGQ2 X-Message-ID-Hash: L7AA5WPCNQRVXWU6WWY5PH7LXQXWJGQ2 X-MailFrom: mprivozn@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: 1741873551278019100 Content-Type: text/plain; charset="utf-8"; x-default="true" There are two places where curl_slist_append() is called but corresponding call to curl_slist_free_all() is missing: virCHMonitorPutNoContent() and virCHMonitorGet() which leads to memleaks: 41 (16 direct, 25 indirect) bytes in 1 blocks are definitely lost in loss r= ecord 992 of 1,998 at 0x4845888: malloc (vg_replace_malloc.c:446) by 0x5B2F8FE: curl_slist_append (in /usr/lib64/libcurl.so.4.8.0) by 0xB3A7B41: virCHMonitorPutNoContent (ch_monitor.c:824) by 0xB3A89FF: virCHMonitorBootVM (ch_monitor.c:1030) by 0xB3AC6F1: virCHProcessStart (ch_process.c:967) by 0xB39B7D4: chDomainCreateXML (ch_driver.c:246) by 0x4CC9D32: virDomainCreateXML (libvirt-domain.c:188) by 0x168F91: remoteDispatchDomainCreateXML (remote_daemon_dispatch_stubs= .h:5186) by 0x168F18: remoteDispatchDomainCreateXMLHelper (remote_daemon_dispatch= _stubs.h:5167) by 0x4B20066: virNetServerProgramDispatchCall (virnetserverprogram.c:423) by 0x4B1FB99: virNetServerProgramDispatch (virnetserverprogram.c:299) by 0x4B28B5E: virNetServerProcessMsg (virnetserver.c:135) 88 (16 direct, 72 indirect) bytes in 1 blocks are definitely lost in loss r= ecord 1,501 of 1,998 at 0x4845888: malloc (vg_replace_malloc.c:446) by 0x5B2F8FE: curl_slist_append (in /usr/lib64/libcurl.so.4.8.0) by 0xB3A7E41: virCHMonitorGet (ch_monitor.c:864) by 0xB3A92E2: virCHMonitorGetInfo (ch_monitor.c:1157) by 0xB3A9CEA: virCHProcessUpdateInfo (ch_process.c:142) by 0xB3AAD36: virCHProcessSetup (ch_process.c:492) by 0xB3AC75A: virCHProcessStart (ch_process.c:973) by 0xB39B7D4: chDomainCreateXML (ch_driver.c:246) by 0x4CC9D32: virDomainCreateXML (libvirt-domain.c:188) by 0x168F91: remoteDispatchDomainCreateXML (remote_daemon_dispatch_stubs= .h:5186) by 0x168F18: remoteDispatchDomainCreateXMLHelper (remote_daemon_dispatch= _stubs.h:5167) by 0x4B20066: virNetServerProgramDispatchCall (virnetserverprogram.c:423) Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- src/ch/ch_monitor.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c index e0d6b490de..0ba927a194 100644 --- a/src/ch/ch_monitor.c +++ b/src/ch/ch_monitor.c @@ -839,6 +839,8 @@ virCHMonitorPutNoContent(virCHMonitor *mon, const char = *endpoint, if (responseCode =3D=3D 200 || responseCode =3D=3D 204) ret =3D 0; =20 + curl_slist_free_all(headers); + return ret; } =20 @@ -884,6 +886,7 @@ virCHMonitorGet(virCHMonitor *mon, const char *endpoint= , virJSONValue **response =20 cleanup: g_free(data.content); + curl_slist_free_all(headers); /* reset the libcurl handle to avoid leaking a stack pointer to data */ curl_easy_reset(mon->handle); =20 --=20 2.48.1 From nobody Mon Dec 15 12:04:27 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=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 174187357268835.770534869367225; Thu, 13 Mar 2025 06:46:12 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 0BC19162; Thu, 13 Mar 2025 09:46:12 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id ABCF81F5B; Thu, 13 Mar 2025 09:44:54 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id AD6841D02; Thu, 13 Mar 2025 09:44:47 -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 369501D02 for ; Thu, 13 Mar 2025 09:44:47 -0400 (EDT) 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-141-v8kPQEbKPJ-jT9zsiYSbnw-1; Thu, 13 Mar 2025 09:44:45 -0400 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 71D5D180025E for ; Thu, 13 Mar 2025 13:44:44 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.3.236]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C11481955BCB for ; Thu, 13 Mar 2025 13:44:43 +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=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741873486; 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=gIu9kQFrc5CCdxpYpZL9MT0PFmKzvmS+W3a84oXomgo=; b=DOyQxbv5oy/wlPmcxdTYudw4vX8UkRh5/sbUtDhFHK2nMrTVVznZZS9Hf/l5dBkJQzE9nl bLQlFFoLrxL4+UQVWWAab4bzvJ6OVviMdPCH2HoUj5u1u7tK24dPf3OyPRaMOSwuiXcJH0 yOa3wMDCLPCfGhVw5mZrc8j3WqTWHKQ= X-MC-Unique: v8kPQEbKPJ-jT9zsiYSbnw-1 X-Mimecast-MFC-AGG-ID: v8kPQEbKPJ-jT9zsiYSbnw_1741873484 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 3/6] ch: Don't leak virCHDomainObjPrivate struct members Date: Thu, 13 Mar 2025 14:44:35 +0100 Message-ID: <4b5d4650d25e5f1a6bbebacb03c8e6589aa1bded.1741873456.git.mprivozn@redhat.com> In-Reply-To: References: 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: rF58mhO22Jta-SLzrgXgcR5Inn01YrmcPHCNRsilSDI_1741873484 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: FW3F2HWQ4AKBIWIA25VKJDZUZGSN3ILS X-Message-ID-Hash: FW3F2HWQ4AKBIWIA25VKJDZUZGSN3ILS X-MailFrom: mprivozn@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: 1741873573838019000 Content-Type: text/plain; charset="utf-8"; x-default="true" There are some members of the virCHDomainObjPrivate struct that are allocated at various stages of domain lifecycle but then are never freed: 1) cgroup - allocated in virDomainCgroupSetupCgroup() 2) autoCpuset - this one is actually never allocated (and thus is always NULL, but soon it may be used. Just free it for now, which is a NOP anyways. 3) autoNodeset - same story as 2). There are two more members, which shouldn't be freed: 1) driver - this is just a raw pointer to the CH driver (see virCHDomainObjPrivateAlloc()). 2) monitor - this member is cleared in virCHProcessStop(), way before control even gets to virCHDomainObjPrivateFree(). 452 (400 direct, 52 indirect) bytes in 1 blocks are definitely lost in loss= record 1,944 of 1,998 at 0x484CEF3: calloc (vg_replace_malloc.c:1675) by 0x4F0E7A9: g_malloc0 (in /usr/lib64/libglib-2.0.so.0.8000.5) by 0x49479CE: virCgroupNewFromParent (vircgroup.c:893) by 0x49481BA: virCgroupNewDomainPartition (vircgroup.c:1068) by 0x494915E: virCgroupNewMachineManual (vircgroup.c:1378) by 0x49492FE: virCgroupNewMachine (vircgroup.c:1432) by 0x4B5E3DE: virDomainCgroupInitCgroup (domain_cgroup.c:377) by 0x4B5E9CD: virDomainCgroupSetupCgroup (domain_cgroup.c:524) by 0xB3AC693: virCHProcessStart (ch_process.c:951) by 0xB39B7D4: chDomainCreateXML (ch_driver.c:246) by 0x4CC9D32: virDomainCreateXML (libvirt-domain.c:188) by 0x168F91: remoteDispatchDomainCreateXML (remote_daemon_dispatch_stubs= .h:5186) Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- src/ch/ch_domain.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ch/ch_domain.c b/src/ch/ch_domain.c index 4f5966adce..a08b18c5b9 100644 --- a/src/ch/ch_domain.c +++ b/src/ch/ch_domain.c @@ -65,6 +65,9 @@ virCHDomainObjPrivateFree(void *data) =20 virChrdevFree(priv->chrdevs); g_free(priv->machineName); + virBitmapFree(priv->autoCpuset); + virBitmapFree(priv->autoNodeset); + virCgroupFree(priv->cgroup); g_free(priv); } =20 --=20 2.48.1 From nobody Mon Dec 15 12:04:27 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=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 1741873598001229.70026335646992; Thu, 13 Mar 2025 06:46:38 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 626C89B1; Thu, 13 Mar 2025 09:46:37 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 0FA21214C; Thu, 13 Mar 2025 09:44:57 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id B4C341EF9; Thu, 13 Mar 2025 09:44:50 -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 0F0AF1EC0 for ; Thu, 13 Mar 2025 09:44:48 -0400 (EDT) Received: from mx-prod-mc-01.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-53-gL0XKoloOjmLV57_i4hVMA-1; Thu, 13 Mar 2025 09:44:46 -0400 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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8B31119560B7 for ; Thu, 13 Mar 2025 13:44:45 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.3.236]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D8AFF1955BCB for ; Thu, 13 Mar 2025 13:44:44 +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=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741873487; 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=8TGM7jRclhnKhgaAoa9wMXpeeMpl14aUICrY6a95h2k=; b=J1NYTsbYT7ytoSDs59eL8UYBrsYHR/l5f4Gp8J7IHvTMwYkNda4qyAI2ZIYxNIjNK1oqTa dU9duYLnHuNbL8W9PPWY7/nRZK3whhbRVoitzgLRaxfbSVKpZ6L9UDM3f77VhgjOYjbGVE 6Zm8WIj6G+qRatQzYqFKGdFhVhgNXPM= X-MC-Unique: gL0XKoloOjmLV57_i4hVMA-1 X-Mimecast-MFC-AGG-ID: gL0XKoloOjmLV57_i4hVMA_1741873485 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 4/6] ch: Free @iothreads array in virCHProcessSetupIOThreads() Date: Thu, 13 Mar 2025 14:44:36 +0100 Message-ID: <0810d691898db87a2f270aefa0330f8f29f8b6bb.1741873456.git.mprivozn@redhat.com> In-Reply-To: References: 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: 3lJ9lgTj4fE9LTRNPnS-Sfwwh81yMyurXyLh2cJoCcc_1741873485 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 3USA54UMGSU7GAEZNDCATCIIW2K6XGFP X-Message-ID-Hash: 3USA54UMGSU7GAEZNDCATCIIW2K6XGFP X-MailFrom: mprivozn@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: 1741873599665019000 Content-Type: text/plain; charset="utf-8"; x-default="true" When the CH driver starts a domain virCHProcessSetupIOThreads() is called eventually which in turn calls virCHMonitorGetIOThreads(). The latter returns an array of iothreads which is never freed leading to a memleak: 130 (104 direct, 26 indirect) bytes in 1 blocks are definitely lost in loss= record 1,804 of 1,998 at 0x484CEF3: calloc (vg_replace_malloc.c:1675) by 0x4F0E7A9: g_malloc0 (in /usr/lib64/libglib-2.0.so.0.8000.5) by 0xB3A9359: virCHMonitorGetIOThreads (ch_monitor.c:1183) by 0xB3AA5BB: virCHProcessSetupIOThreads (ch_process.c:348) by 0xB3AAC59: virCHProcessSetup (ch_process.c:480) by 0xB3AC75A: virCHProcessStart (ch_process.c:973) by 0xB39B7D4: chDomainCreateXML (ch_driver.c:246) by 0x4CC9D32: virDomainCreateXML (libvirt-domain.c:188) by 0x168F91: remoteDispatchDomainCreateXML (remote_daemon_dispatch_stubs= .h:5186) by 0x168F18: remoteDispatchDomainCreateXMLHelper (remote_daemon_dispatch= _stubs.h:5167) by 0x4B20066: virNetServerProgramDispatchCall (virnetserverprogram.c:423) by 0x4B1FB99: virNetServerProgramDispatch (virnetserverprogram.c:299) Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- src/ch/ch_process.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/ch/ch_process.c b/src/ch/ch_process.c index 9a85f7869e..cbf98faaf0 100644 --- a/src/ch/ch_process.c +++ b/src/ch/ch_process.c @@ -344,6 +344,7 @@ virCHProcessSetupIOThreads(virDomainObj *vm) virDomainIOThreadInfo **iothreads =3D NULL; size_t i; int niothreads; + int ret =3D -1; =20 if ((niothreads =3D virCHMonitorGetIOThreads(priv->monitor, &iothreads= )) < 0) return -1; @@ -351,9 +352,16 @@ virCHProcessSetupIOThreads(virDomainObj *vm) for (i =3D 0; i < niothreads; i++) { VIR_DEBUG("IOThread index =3D %zu , tid =3D %d", i, iothreads[i]->= iothread_id); if (virCHProcessSetupIOThread(vm, iothreads[i]) < 0) - return -1; + goto cleanup; } - return 0; + + ret =3D 0; + cleanup: + for (i =3D 0; i < niothreads; i++) { + virDomainIOThreadInfoFree(iothreads[i]); + } + g_free(iothreads); + return ret; } =20 static int --=20 2.48.1 From nobody Mon Dec 15 12:04:27 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=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 174187361371732.813309477146845; Thu, 13 Mar 2025 06:46:53 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 220292151; Thu, 13 Mar 2025 09:46:53 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id AE66D2158; Thu, 13 Mar 2025 09:44:58 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6FC49212C; Thu, 13 Mar 2025 09:44:55 -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 261F41F54 for ; Thu, 13 Mar 2025 09:44:49 -0400 (EDT) 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-387-cHhZE95sM-SSKRd1zYP5SQ-1; Thu, 13 Mar 2025 09:44:47 -0400 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 C819B195608B for ; Thu, 13 Mar 2025 13:44:46 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.3.236]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F03141955BCB for ; Thu, 13 Mar 2025 13:44:45 +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=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741873488; 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=V8FIFWXJq3AtA2ngJTmyijAoGu0YePAa5tX49SuUVDk=; b=TBfxle6sGsRRfgv4WjdTkkvPtofJhhDC6F6c+Bpbo1aTN3V0e9YSNR1tFcQmMsGCzL/Gg7 egi2lJHlkWRC3c9LnUKxnLm7ULiOIoa3e63g9H+3hYdyvltoMHFfKWRrlVGveGJdSAjgId vp5Qs85TPU5j9NmHt9sN3S4zq4gRZj0= X-MC-Unique: cHhZE95sM-SSKRd1zYP5SQ-1 X-Mimecast-MFC-AGG-ID: cHhZE95sM-SSKRd1zYP5SQ_1741873486 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 5/6] ch: Unref @cfg in virCHProcessStop() Date: Thu, 13 Mar 2025 14:44:37 +0100 Message-ID: In-Reply-To: References: 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: UtCMWptSZg60Tqf1jai5Bf9KYcKN_xIbgNX_gt70NO8_1741873486 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: Q4X2VWQHXUBQZKUVE3RCGS5B32PICO2Z X-Message-ID-Hash: Q4X2VWQHXUBQZKUVE3RCGS5B32PICO2Z X-MailFrom: mprivozn@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: 1741873615799019000 Content-Type: text/plain; charset="utf-8"; x-default="true" At the beginning of virCHProcessStop() the ref to driver config is obtained (via virCHDriverGetConfig()), but corresponding unref call is lacking. Use g_autoptr() to make sure the config is unrefed always. Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- src/ch/ch_process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ch/ch_process.c b/src/ch/ch_process.c index cbf98faaf0..79f5990cc1 100644 --- a/src/ch/ch_process.c +++ b/src/ch/ch_process.c @@ -997,11 +997,11 @@ virCHProcessStop(virCHDriver *driver, virDomainObj *vm, virDomainShutoffReason reason) { + g_autoptr(virCHDriverConfig) cfg =3D virCHDriverGetConfig(driver); int ret; int retries =3D 0; unsigned int hostdev_flags =3D VIR_HOSTDEV_SP_PCI; virCHDomainObjPrivate *priv =3D vm->privateData; - virCHDriverConfig *cfg =3D virCHDriverGetConfig(driver); virDomainDef *def =3D vm->def; size_t i; =20 --=20 2.48.1 From nobody Mon Dec 15 12:04:27 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=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 1741873629802827.144132687618; Thu, 13 Mar 2025 06:47:09 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id C953FBA3; Thu, 13 Mar 2025 09:47:08 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 40464215E; Thu, 13 Mar 2025 09:45:03 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 22BF12102; Thu, 13 Mar 2025 09:44:59 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 61C0B1F8E for ; Thu, 13 Mar 2025 09:44:50 -0400 (EDT) Received: from mx-prod-mc-02.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-8-TfImLzX4PPudnBG2YBnmvQ-1; Thu, 13 Mar 2025 09:44:48 -0400 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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CC82C1956087 for ; Thu, 13 Mar 2025 13:44:47 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.3.236]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1C76B1955BCB for ; Thu, 13 Mar 2025 13:44:46 +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=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741873490; 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=OrFd+HOxxVPGKRFUDS7QmPnyCc5MNQ4Ywoq5itICn+E=; b=F5/Zo5CFhIT7F0bKtWslhoT2GiZLQBj490r/SfzipZi8cbUVpxM0+jDWn/BMfc+SbsYsRh 0CbpXdtgXWbPT5M/ia98nNVoURkq2nJUfYasBVT6NapMtvnJOCtaRVuE9g8NHp43eCKugM FnZA0xixM1XfbiFpiahuI9gHsyFPPsA= X-MC-Unique: TfImLzX4PPudnBG2YBnmvQ-1 X-Mimecast-MFC-AGG-ID: TfImLzX4PPudnBG2YBnmvQ_1741873487 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 6/6] ch: Rework virCHProcessConnectMonitor() Date: Thu, 13 Mar 2025 14:44:38 +0100 Message-ID: <59e87ecddc0ed75759cd35e70b5dcb493d9b800b.1741873456.git.mprivozn@redhat.com> In-Reply-To: References: 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: yj_atdTepLdotFuS6KeKOarMZQZS4ze33ce9OyoM1xU_1741873487 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: SKGW7BDISDFQS67XOVLXM47P7QIIPPA7 X-Message-ID-Hash: SKGW7BDISDFQS67XOVLXM47P7QIIPPA7 X-MailFrom: mprivozn@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: 1741873631440019100 Content-Type: text/plain; charset="utf-8"; x-default="true" Firstly, let's switch from explicit virCHDriverGetConfig() + virObjectUnref() combo to g_autoptr(virCHDriverConfig). This leaves us with the @monitor variable which is initialized to NULL only to be then set to the retval of virCHMonitorNew() and returned instantly. Well, the variable is now useless and can be dropped. Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- src/ch/ch_process.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/ch/ch_process.c b/src/ch/ch_process.c index 79f5990cc1..ee86430e08 100644 --- a/src/ch/ch_process.c +++ b/src/ch/ch_process.c @@ -53,13 +53,9 @@ virCHProcessConnectMonitor(virCHDriver *driver, virDomainObj *vm, int logfile) { - virCHMonitor *monitor =3D NULL; - virCHDriverConfig *cfg =3D virCHDriverGetConfig(driver); + g_autoptr(virCHDriverConfig) cfg =3D virCHDriverGetConfig(driver); =20 - monitor =3D virCHMonitorNew(vm, cfg, logfile); - - virObjectUnref(cfg); - return monitor; + return virCHMonitorNew(vm, cfg, logfile); } =20 static void --=20 2.48.1