From nobody Fri May 10 10:13:25 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) 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 1701187315398207.94002125558222; Tue, 28 Nov 2023 08:01:55 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id C5C811990; Tue, 28 Nov 2023 11:01:54 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 49C921A82; Tue, 28 Nov 2023 10:59:43 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 09C701992; Tue, 28 Nov 2023 10:59:33 -0500 (EST) 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 7D242198B for ; Tue, 28 Nov 2023 10:59:32 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-228-MUbI2m4XMvO0LWR_A_az_Q-1; Tue, 28 Nov 2023 10:59:30 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 76C0D811003 for ; Tue, 28 Nov 2023 15:59:30 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.3.102]) by smtp.corp.redhat.com (Postfix) with ESMTP id 21AA3492BFA for ; Tue, 28 Nov 2023 15:59:30 +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=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: MUbI2m4XMvO0LWR_A_az_Q-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 1/4] virpci: Decrease scope of VIR_PF_PHYS_PORT_NAME_REGEX macro Date: Tue, 28 Nov 2023 16:59:25 +0100 Message-ID: <5d8ad1d4eeb610c6c0f2139cdb92cb0400435ab3.1701187147.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: K5I3BHT3DTY3CABGEONKIJ5VCEJUXTWA X-Message-ID-Hash: K5I3BHT3DTY3CABGEONKIJ5VCEJUXTWA 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: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1701187316115000001 The VIR_PF_PHYS_PORT_NAME_REGEX macro is used only in virPCIGetNetName() and nowhere else. It's not necessary to expose it in the header file. Signed-off-by: Michal Privoznik Reviewed-by: Jonathon Jongsma Reviewed-by: J=C3=A1n Tomko --- src/util/virpci.c | 8 ++++++++ src/util/virpci.h | 5 ----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index baacde4c14..eae698c0a0 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -2536,6 +2536,12 @@ virPCIDeviceAddressGetSysfsFile(virPCIDeviceAddress = *addr, return 0; } =20 + +/* Represents format of PF's phys_port_name in switchdev mode: + * 'p%u' or 'p%us%u'. New line checked since value is read from sysfs file. + */ +# define VIR_PF_PHYS_PORT_NAME_REGEX "(p[0-9]+$)|(p[0-9]+s[0-9]+$)" + /** * virPCIGetNetName: * @device_link_sysfs_path: sysfs path to the PCI device @@ -2661,6 +2667,8 @@ virPCIGetNetName(const char *device_link_sysfs_path, return -1; } =20 +# undef VIR_PF_PHYS_PORT_NAME_REGEX + int virPCIGetVirtualFunctionInfo(const char *vf_sysfs_device_path, int pfNetDevIdx, diff --git a/src/util/virpci.h b/src/util/virpci.h index faca6cf6f9..e964a2685c 100644 --- a/src/util/virpci.h +++ b/src/util/virpci.h @@ -52,11 +52,6 @@ struct _virZPCIDeviceAddress { =20 #define VIR_PCI_DEVICE_ADDRESS_FMT "%04x:%02x:%02x.%d" =20 -/* Represents format of PF's phys_port_name in switchdev mode: - * 'p%u' or 'p%us%u'. New line checked since value is read from sysfs file. - */ -#define VIR_PF_PHYS_PORT_NAME_REGEX "(p[0-9]+$)|(p[0-9]+s[0-9]+$)" - struct _virPCIDeviceAddress { unsigned int domain; unsigned int bus; --=20 2.41.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Fri May 10 10:13:25 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) 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 17011875047844.127327004683593; Tue, 28 Nov 2023 08:05:04 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 2ABB51A07; Tue, 28 Nov 2023 11:05:04 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id AD5F21A62; Tue, 28 Nov 2023 11:00:11 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 2F06F197C; Tue, 28 Nov 2023 10:59:35 -0500 (EST) 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 29B5F1992 for ; Tue, 28 Nov 2023 10:59:34 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-116-hdNPEixyPIi7GWyJBNmUoQ-1; Tue, 28 Nov 2023 10:59:31 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 09F558556EC for ; Tue, 28 Nov 2023 15:59:31 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.3.102]) by smtp.corp.redhat.com (Postfix) with ESMTP id A9634492BFA for ; Tue, 28 Nov 2023 15:59:30 +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=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: hdNPEixyPIi7GWyJBNmUoQ-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 2/4] qemu_command: Don't open code virPCIDeviceAddressAsString() Date: Tue, 28 Nov 2023 16:59:26 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: P7N372J4VQZTOKM6PL3JDXKWGUCPAUDD X-Message-ID-Hash: P7N372J4VQZTOKM6PL3JDXKWGUCPAUDD 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: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1701187505390000001 When building a hostdev props, its PCI address is formatted via g_strdup_printf(VIR_PCI_DEVICE_ADDRESS_FMT, ...); Well, we have a function that does exactly that: virPCIDeviceAddressAsString(). Us the latter. Signed-off-by: Michal Privoznik Reviewed-by: Jonathon Jongsma Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d54149ed2d..23909dbbab 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4704,11 +4704,7 @@ qemuBuildPCIHostdevDevProps(const virDomainDef *def, g_autoptr(virJSONValue) props =3D NULL; virDomainHostdevSubsysPCI *pcisrc =3D &dev->source.subsys.u.pci; virDomainNetTeamingInfo *teaming; - g_autofree char *host =3D g_strdup_printf(VIR_PCI_DEVICE_ADDRESS_FMT, - pcisrc->addr.domain, - pcisrc->addr.bus, - pcisrc->addr.slot, - pcisrc->addr.function); + g_autofree char *host =3D virPCIDeviceAddressAsString(&pcisrc->addr); const char *failover_pair_id =3D NULL; =20 /* caller has to assign proper passthrough backend type */ --=20 2.41.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Fri May 10 10:13:25 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) 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 1701187381964722.3429160365022; Tue, 28 Nov 2023 08:03:01 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 403481A3A; Tue, 28 Nov 2023 11:03:01 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id AEA0D1864; Tue, 28 Nov 2023 10:59:52 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id A91401990; Tue, 28 Nov 2023 10:59:33 -0500 (EST) 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 43B59197C for ; Tue, 28 Nov 2023 10:59:33 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-50-QdkuPNtWM4-k9gVuOyMyCQ-1; Tue, 28 Nov 2023 10:59:31 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 92302185A781 for ; Tue, 28 Nov 2023 15:59:31 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.3.102]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3D33A492BFA for ; Tue, 28 Nov 2023 15:59:31 +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=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: QdkuPNtWM4-k9gVuOyMyCQ-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 3/4] vircpi: Decrease scope of VIR_PCI_DEVICE_ADDRESS_FMT macro Date: Tue, 28 Nov 2023 16:59:27 +0100 Message-ID: <44b1ab425ffbe77397f603c1062c8c6c7e1c5328.1701187147.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: KTXE5MOLHXVD2H7HSDLJQUVHEV27HGWU X-Message-ID-Hash: KTXE5MOLHXVD2H7HSDLJQUVHEV27HGWU 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: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1701187382437000001 The VIR_PCI_DEVICE_ADDRESS_FMT macro is used only in virpci.c and nowhere else. It's not necessary to expose it in the header file. Signed-off-by: Michal Privoznik Reviewed-by: Jonathon Jongsma Reviewed-by: J=C3=A1n Tomko --- src/util/virpci.c | 1 + src/util/virpci.h | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index eae698c0a0..afce7b52b7 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -42,6 +42,7 @@ VIR_LOG_INIT("util.pci"); =20 #define PCI_SYSFS "/sys/bus/pci/" #define PCI_ID_LEN 10 /* "XXXX XXXX" */ +#define VIR_PCI_DEVICE_ADDRESS_FMT "%04x:%02x:%02x.%d" =20 VIR_ENUM_IMPL(virPCIELinkSpeed, VIR_PCIE_LINK_SPEED_LAST, diff --git a/src/util/virpci.h b/src/util/virpci.h index e964a2685c..bc7cb2329f 100644 --- a/src/util/virpci.h +++ b/src/util/virpci.h @@ -50,8 +50,6 @@ struct _virZPCIDeviceAddress { /* Don't forget to update virPCIDeviceAddressCopy if needed. */ }; =20 -#define VIR_PCI_DEVICE_ADDRESS_FMT "%04x:%02x:%02x.%d" - struct _virPCIDeviceAddress { unsigned int domain; unsigned int bus; --=20 2.41.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Fri May 10 10:13:25 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) 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 170118744715262.015690318744646; Tue, 28 Nov 2023 08:04:07 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 8179719C6; Tue, 28 Nov 2023 11:04:06 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 9916317AF; Tue, 28 Nov 2023 11:00:00 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id DDAE9199B; Tue, 28 Nov 2023 10:59:34 -0500 (EST) 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 EB964198B for ; Tue, 28 Nov 2023 10:59:33 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-633-MvrdgfIbMhe7jpHbyfdFLA-1; Tue, 28 Nov 2023 10:59:32 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 26B1E811009 for ; Tue, 28 Nov 2023 15:59:32 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.3.102]) by smtp.corp.redhat.com (Postfix) with ESMTP id C53F7492BFC for ; Tue, 28 Nov 2023 15:59:31 +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=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: MvrdgfIbMhe7jpHbyfdFLA-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 4/4] ch: Don't leak ch_driver->chCaps Date: Tue, 28 Nov 2023 16:59:28 +0100 Message-ID: <8bfd1b12ae15c1a43ba3d3ceddb783a37ad6ac7c.1701187147.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: SUORA577GQNTAS5CBZUFBCDU64MR5RSA X-Message-ID-Hash: SUORA577GQNTAS5CBZUFBCDU64MR5RSA 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: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1701187448894000001 During CH driver initialization (chStateInitialize()) the driver's capabilities bitmap is allocated (virCHCapsInitCHVersionCaps()), but corresponding free call is missing in chStateCleanup(). And while at it, reorder calls to virObjectUnref() inside of chStateCleanup() to be the reverse order of that in chStateInitialize() so that it's easier to spot missing free/unref call. Signed-off-by: Michal Privoznik Reviewed-by: Jonathon Jongsma Reviewed-by: J=C3=A1n Tomko --- src/ch/ch_driver.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c index bd271fc0ee..96de5044ac 100644 --- a/src/ch/ch_driver.c +++ b/src/ch/ch_driver.c @@ -850,10 +850,11 @@ static int chStateCleanup(void) if (ch_driver =3D=3D NULL) return -1; =20 - virObjectUnref(ch_driver->domains); + virBitmapFree(ch_driver->chCaps); + virObjectUnref(ch_driver->config); virObjectUnref(ch_driver->xmlopt); virObjectUnref(ch_driver->caps); - virObjectUnref(ch_driver->config); + virObjectUnref(ch_driver->domains); virMutexDestroy(&ch_driver->lock); g_clear_pointer(&ch_driver, g_free); =20 --=20 2.41.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org