From nobody Mon Feb 9 23:05:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1680179907; cv=none; d=zohomail.com; s=zohoarc; b=HGPH1I43tSuSESEucv6Oy+TM3dqiX+82wfjLeVG+vr0wDLIjSu3s+ve2y8biZSk2ZvaLlT8CLZAlN8/SKp+FLhegWGj/YbgpY4pqYYonR9fNEHVDficpUv03n+MsFeduv06UQBzA1t+W8q0rElW4PT21Etp0+c5ufv71iqKhfKA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680179907; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qI1Vey/ZYWwYC6sVp5lxDF97WsAwGCV0nqlfEfGBCSk=; b=jjI7dy7fBvzM13kJgFmzIJU59TasFz1dqSMroeS9SZWBDqaFY7xHevHCFSWWlqPlUTW0BRhDMjZvyuFs9UoSZeZ5FlbpZqbfGZhmhrSHxHYkugdvnFlxvvVwAHjriFXjqrIux4niJmWHdAg/l5v+z+88A2CWyeVCt6iuIkFVUII= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1680179907529216.9243115145922; Thu, 30 Mar 2023 05:38:27 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-458-9uh30JBGPyWq7H3h47X0KQ-1; Thu, 30 Mar 2023 08:38:23 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 73097857A93; Thu, 30 Mar 2023 12:38:20 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 598A24042AC6; Thu, 30 Mar 2023 12:38:20 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5F35719465BD; Thu, 30 Mar 2023 12:38:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 323961946587 for ; Thu, 30 Mar 2023 12:38:18 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 081A6C15BBA; Thu, 30 Mar 2023 12:38:18 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 849D3C15BA0 for ; Thu, 30 Mar 2023 12:38:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680179906; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=qI1Vey/ZYWwYC6sVp5lxDF97WsAwGCV0nqlfEfGBCSk=; b=ZCjkLCD8cR252Z6hKp6Al5uHiVOTt3wXg3MZ9LipylAv6fa/kmbVo0oJ4qEwz99nBICVrB XKNNVaE8yyMqXQSdewXvOkMprafqOb1pYw24Qf3rwKhGtwHyFSbZ5s23CQquelCfQgm+Xr 4Aw7INDajAKxwonNSTlk3TI69bGBsio= X-MC-Unique: 9uh30JBGPyWq7H3h47X0KQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 1/3] conf: Clear pointer to freed bitmap holding hostdev's 'origstates' Date: Thu, 30 Mar 2023 14:38:13 +0200 Message-Id: <09dd31cb70012c42712470e79a03339d1850bf33.1680179855.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1680179909702100003 Content-Type: text/plain; charset="utf-8" 'virDomainHostdevDefClear' must clear the pointers too as it can be invoked multiple times on the same object e.g. inside qemuDomainRemoveHostDevice once via virDomainHostdevDefFree which skips freeing the object if it's used via and thus has a 'net' definition corresponding to it, and then subsequently via virDomainNetDefFree. Fix it by clearing the pointer along with freeing it. Fixes: d9e4075d4e9 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D2182961 Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9f49c6e62d..08527964d1 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3384,7 +3384,7 @@ void virDomainHostdevDefClear(virDomainHostdevDef *de= f) VIR_FREE(def->source.subsys.u.scsi_host.wwpn); break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: - virBitmapFree(def->source.subsys.u.pci.origstates); + g_clear_pointer(&def->source.subsys.u.pci.origstates, virBitma= pFree); break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV: --=20 2.39.2 From nobody Mon Feb 9 23:05:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1680179911; cv=none; d=zohomail.com; s=zohoarc; b=Nryc7JePOhrcCqNO6Xm+c/eUe1egUwlrwuEhodKdSEeKQxJvxrVPD6l6vjhY0BWmlrqTSDvH5RINb52fp3YusfNG86FyQrKxoc8Tej0ZJilQHVj4kDan3TH6ex0er2IASh3MFfDB87DDBmPyvnOjP+So/uf+JFTuUymmEdMmlxs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680179911; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EDLchdhl5EJ3RGsCyL7mU10j1YkQHngvfn1pn0eBwKM=; b=UFo6cJQkdLvhTsDdYLqWNMJZambo6g2+/8x+WSHasE/MsJDYbmdJLdhZbAcrvAKK7PWfNYz6svHkVaeNdw2itCO7jAlFU+q7qPy5xfpmF7s0m4MICtpMMy2BSqOrslQqZM2cubUF3GLN+6Df5IIE+HG9HSkxcciA+TRvLHVkhqo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1680179911939856.5437018339464; Thu, 30 Mar 2023 05:38:31 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-488-ReOyqN1jONCMZZlQ5HT5_Q-1; Thu, 30 Mar 2023 08:38:26 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3CBEA8030DC; Thu, 30 Mar 2023 12:38:23 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2A0AF492C3E; Thu, 30 Mar 2023 12:38:23 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1CD60194658F; Thu, 30 Mar 2023 12:38:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id EFFB31946587 for ; Thu, 30 Mar 2023 12:38:18 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E40A6C15BC0; Thu, 30 Mar 2023 12:38:18 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6215AC15BA0 for ; Thu, 30 Mar 2023 12:38:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680179911; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=EDLchdhl5EJ3RGsCyL7mU10j1YkQHngvfn1pn0eBwKM=; b=V7phHGQqsNsE7Dy2rE0AK7EOZjM2BvNuc9VcZ7pPAIX2jB0Y2mhmCeJ4YhF1t3oBYeYHrJ hRMwVcNZm09RJv4RvNM3fipZIWZPfegOdnjIp/5/p7rJD4f5Hm7VKSPhAQLOYgqlDrivpL sqNjoRQZid7V+DfrdnvuGoWBMqi4jtE= X-MC-Unique: ReOyqN1jONCMZZlQ5HT5_Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 2/3] conf: Unexport virDomainHostdevDefClear Date: Thu, 30 Mar 2023 14:38:14 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1680179913755100002 Content-Type: text/plain; charset="utf-8" Move it before it's first usage and make it static. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 135 ++++++++++++++++++++------------------- src/conf/domain_conf.h | 1 - src/libvirt_private.syms | 1 - 3 files changed, 69 insertions(+), 68 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 08527964d1..7ad4ff26ab 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2589,6 +2589,75 @@ void virDomainFSDefFree(virDomainFSDef *def) g_free(def); } + +static void +virDomainHostdevSubsysSCSIClear(virDomainHostdevSubsysSCSI *scsisrc) +{ + if (scsisrc->protocol =3D=3D VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISC= SI) { + g_clear_pointer(&scsisrc->u.iscsi.src, virObjectUnref); + } else { + VIR_FREE(scsisrc->u.host.adapter); + g_clear_pointer(&scsisrc->u.host.src, virObjectUnref); + } +} + + +static void +virDomainHostdevDefClear(virDomainHostdevDef *def) +{ + if (!def) + return; + + /* Free all resources in the hostdevdef. Currently the only + * such resource is the virDomainDeviceInfo. + */ + + /* If there is a parentnet device object, it will handle freeing + * def->info. + */ + if (!def->parentnet) + virDomainDeviceInfoFree(def->info); + + virDomainNetTeamingInfoFree(def->teaming); + + switch (def->mode) { + case VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES: + switch ((virDomainHostdevCapsType) def->source.caps.type) { + case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_STORAGE: + VIR_FREE(def->source.caps.u.storage.block); + break; + case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_MISC: + VIR_FREE(def->source.caps.u.misc.chardev); + break; + case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET: + VIR_FREE(def->source.caps.u.net.ifname); + virNetDevIPInfoClear(&def->source.caps.u.net.ip); + break; + case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_LAST: + break; + } + break; + case VIR_DOMAIN_HOSTDEV_MODE_SUBSYS: + switch ((virDomainHostdevSubsysType) def->source.subsys.type) { + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: + virDomainHostdevSubsysSCSIClear(&def->source.subsys.u.scsi); + break; + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST: + VIR_FREE(def->source.subsys.u.scsi_host.wwpn); + break; + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: + g_clear_pointer(&def->source.subsys.u.pci.origstates, virBitma= pFree); + break; + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV: + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: + break; + } + break; + } +} + + void virDomainActualNetDefFree(virDomainActualNetDef *def) { @@ -3329,72 +3398,6 @@ virDomainHostdevDefNew(void) } -static void -virDomainHostdevSubsysSCSIClear(virDomainHostdevSubsysSCSI *scsisrc) -{ - if (scsisrc->protocol =3D=3D VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISC= SI) { - g_clear_pointer(&scsisrc->u.iscsi.src, virObjectUnref); - } else { - VIR_FREE(scsisrc->u.host.adapter); - g_clear_pointer(&scsisrc->u.host.src, virObjectUnref); - } -} - - -void virDomainHostdevDefClear(virDomainHostdevDef *def) -{ - if (!def) - return; - - /* Free all resources in the hostdevdef. Currently the only - * such resource is the virDomainDeviceInfo. - */ - - /* If there is a parentnet device object, it will handle freeing - * def->info. - */ - if (!def->parentnet) - virDomainDeviceInfoFree(def->info); - - virDomainNetTeamingInfoFree(def->teaming); - - switch (def->mode) { - case VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES: - switch ((virDomainHostdevCapsType) def->source.caps.type) { - case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_STORAGE: - VIR_FREE(def->source.caps.u.storage.block); - break; - case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_MISC: - VIR_FREE(def->source.caps.u.misc.chardev); - break; - case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET: - VIR_FREE(def->source.caps.u.net.ifname); - virNetDevIPInfoClear(&def->source.caps.u.net.ip); - break; - case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_LAST: - break; - } - break; - case VIR_DOMAIN_HOSTDEV_MODE_SUBSYS: - switch ((virDomainHostdevSubsysType) def->source.subsys.type) { - case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: - virDomainHostdevSubsysSCSIClear(&def->source.subsys.u.scsi); - break; - case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST: - VIR_FREE(def->source.subsys.u.scsi_host.wwpn); - break; - case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: - g_clear_pointer(&def->source.subsys.u.pci.origstates, virBitma= pFree); - break; - case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: - case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV: - case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: - break; - } - break; - } -} - static virDomainTPMDef * virDomainTPMDefNew(virDomainXMLOption *xmlopt) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 5a2c70f012..bd6b7a1a19 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3574,7 +3574,6 @@ void virDomainVideoDefFree(virDomainVideoDef *def); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainVideoDef, virDomainVideoDefFree); void virDomainVideoDefClear(virDomainVideoDef *def); virDomainHostdevDef *virDomainHostdevDefNew(void); -void virDomainHostdevDefClear(virDomainHostdevDef *def); void virDomainHostdevDefFree(virDomainHostdevDef *def); void virDomainHubDefFree(virDomainHubDef *def); void virDomainRedirdevDefFree(virDomainRedirdevDef *def); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 87c3bab64f..2cd975a8a4 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -461,7 +461,6 @@ virDomainGraphicsVNCSharePolicyTypeFromString; virDomainGraphicsVNCSharePolicyTypeToString; virDomainHasNet; virDomainHostdevCapsTypeToString; -virDomainHostdevDefClear; virDomainHostdevDefFree; virDomainHostdevDefNew; virDomainHostdevFind; --=20 2.39.2 From nobody Mon Feb 9 23:05:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1680179911; cv=none; d=zohomail.com; s=zohoarc; b=UTB8yURjtYcQvmUxiMx5RN8N9WtYV234ACdOh1Aa43SVb9WObdEv78mqwy/SiiHUkWWECSoswJP1tS+9QG9cGt1OnIEur/0bc/3GAdr9i0JJD3aMgDOVU+RG+RdRct84wXQc+//6EFy97+vLqljSPpm6qhXEh4+qSICkOgRmNNI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680179911; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zydY7sz544O8LupL6aP2jEYSYJRPvqgtmH8xP0BkNfQ=; b=guKwn7ViAEhuHbKhWyX+tkzDLmQirngVkgu1y40DfT5Xj/GxSvPJHvjmenkDKpXzOXUARmuOWgX1wrQJk+giyHtaDFH4jtU+tozJvEqNyozRRdehb074FuXv7KDrJfN0VXv+4vR7QNDdumEAKRpd2XOmBHgSea+1DLBFMb+A/qE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1680179911917982.8436852975005; Thu, 30 Mar 2023 05:38:31 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-592-e_JMX4oCMGylnB-Te8XOJA-1; Thu, 30 Mar 2023 08:38:25 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E113028135B3; Thu, 30 Mar 2023 12:38:20 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id BCDE6492B11; Thu, 30 Mar 2023 12:38:20 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9618E1946597; Thu, 30 Mar 2023 12:38:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D7B1B1946597 for ; Thu, 30 Mar 2023 12:38:19 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C80F8C15BB8; Thu, 30 Mar 2023 12:38:19 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4AD6DC15BA0 for ; Thu, 30 Mar 2023 12:38:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680179910; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=zydY7sz544O8LupL6aP2jEYSYJRPvqgtmH8xP0BkNfQ=; b=EXQzv7vWgjh5WEysEa6JqchmZjIZg+TWrOShb+nX4Kdhi+1XnEMZ7UQY+uLH+q28zhE8UD 3GTFtcsvmlgGwofdWHIZVPpPvn177fhD0aSvWDEbTqXHDyGNA0T7lSVg+HKBczZAEtQ4m1 gHpKLqxLRxfqWXLjMTRSlmGPikWCYTs= X-MC-Unique: e_JMX4oCMGylnB-Te8XOJA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 3/3] virDomainHostdevDefClear: Fix and shorten comment Date: Thu, 30 Mar 2023 14:38:15 +0200 Message-Id: <851a2b28630e986a84d0d3982c40360701f111fa.1680179855.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1680179913735100001 Content-Type: text/plain; charset="utf-8" There's more stuff than device info to clear nowadays. Drop the misleading comment. Shorten the comment saying that device info is freed elsewhere when 'parentnet' is present. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7ad4ff26ab..f8067be49a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2608,13 +2608,7 @@ virDomainHostdevDefClear(virDomainHostdevDef *def) if (!def) return; - /* Free all resources in the hostdevdef. Currently the only - * such resource is the virDomainDeviceInfo. - */ - - /* If there is a parentnet device object, it will handle freeing - * def->info. - */ + /* Device info is freed with 'parentnet' if present. */ if (!def->parentnet) virDomainDeviceInfoFree(def->info); --=20 2.39.2