From nobody Mon Feb 9 12:10:27 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 --- 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