From nobody Sun Feb 8 23:05:37 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1669208121; cv=none; d=zohomail.com; s=zohoarc; b=O8hm6QxS5c7hTjUQw4efQlZyqZ9S5WA+ZDr8H6g07YMyvb+o5mtJqnrerCPt/C0Areg10HbFcTJ/xIqWbmJrvshaCE3vXKbvNZqVMdTQWUqVhCcnMmGGx37Uy1ZVPsPKlfRqG3ZXS6YpS+aPXkdy7PZjIa0qB7jGH9xYp/XRycE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669208121; 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=VZKKvmf7iHSFowLIjdtBRPitQeOpytJDYNKhvPCKDmM=; b=Cl6h7oyS+ErAYS+Yb1I0cBBEDRPQzOMGFvxrGrqZLWlICCP8sJjvdWaMD4nQBUFADI0Jjv45tYBBslwdZbxRr1aWE4rjiHvYxRPjsFNT5f3oTIV50czf2rYyxEo4ovWWHC6vK/mM6l9WL8bVRNtafNbYQPZ0NCumVuCyfATzuZo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 16692081214481021.5874519267995; Wed, 23 Nov 2022 04:55:21 -0800 (PST) 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-455-SPn0vDsaNeKJTyp9y47bsw-1; Wed, 23 Nov 2022 07:55:18 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 29FEA3833286; Wed, 23 Nov 2022 12:55:16 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id BE3464EA4E; Wed, 23 Nov 2022 12:55:15 +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 667ED1946589; Wed, 23 Nov 2022 12:55:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id F11C41946587 for ; Wed, 23 Nov 2022 12:36:50 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D59D72166B31; Wed, 23 Nov 2022 12:36:50 +0000 (UTC) Received: from speedmetal.redhat.com (ovpn-208-20.brq.redhat.com [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2D01E2166B26 for ; Wed, 23 Nov 2022 12:36:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669208120; 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=VZKKvmf7iHSFowLIjdtBRPitQeOpytJDYNKhvPCKDmM=; b=TbOjV6AgM7W7jvlNMZ5JHWkMKtRzJkxZbvGnBW/Wphp44wPob48P8zuZQD5/60bKryGToF sZeAMp+wpGiyStWgLTmU8Rs5LeYMtQOZWKYPZ/pC/RgKu+59e6ZsSENtKwdTAYT8mlhsKy jJYHpXFES/blHnEfI1ZdKTlvD1XtYM0= X-MC-Unique: SPn0vDsaNeKJTyp9y47bsw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 7/7] conf: domain: Remove virDomainDeviceDefCopy Date: Wed, 23 Nov 2022 13:36:41 +0100 Message-Id: <67981e185cf799f26183b761c8ec67ffbb8e578c.1669206840.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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.5 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: 1669208123694100001 Content-Type: text/plain; charset="utf-8" The function is now unused. Remove it to dissuade anybody from trying to use it in the future. Signed-off-by: Peter Krempa --- src/conf/domain_conf.c | 121 --------------------------------------- src/conf/domain_conf.h | 4 -- src/libvirt_private.syms | 1 - 3 files changed, 126 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3790121cf7..ce16cc414a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -28347,127 +28347,6 @@ virDomainNetFindByName(virDomainDef *def, } -/** - * virDomainDeviceDefCopy: - * @caps: Capabilities - * @def: Domain definition to which @src belongs - * @src: source to be copied - * - * virDomainDeviceDefCopy does a deep copy of only the parts of a - * DeviceDef that are valid when just the flag VIR_DOMAIN_DEF_PARSE_INACTI= VE is - * set. This means that any part of the device xml that is conditionally - * parsed/formatted based on some other flag being set (or on the INACTIVE - * flag being reset) *will not* be copied to the destination. Caveat empto= r. - * - * Returns a pointer to copied @src or NULL in case of error. - */ -virDomainDeviceDef * -virDomainDeviceDefCopy(virDomainDeviceDef *src, - const virDomainDef *def, - virDomainXMLOption *xmlopt, - void *parseOpaque) -{ - g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - int flags =3D VIR_DOMAIN_DEF_FORMAT_INACTIVE | VIR_DOMAIN_DEF_FORMAT_S= ECURE; - int rc =3D -1; - g_autofree char *xmlStr =3D NULL; - - switch ((virDomainDeviceType) src->type) { - case VIR_DOMAIN_DEVICE_DISK: - rc =3D virDomainDiskDefFormat(&buf, src->data.disk, flags, xmlopt); - break; - case VIR_DOMAIN_DEVICE_LEASE: - virDomainLeaseDefFormat(&buf, src->data.lease); - rc =3D 0; - break; - case VIR_DOMAIN_DEVICE_FS: - rc =3D virDomainFSDefFormat(&buf, src->data.fs, flags); - break; - case VIR_DOMAIN_DEVICE_NET: - rc =3D virDomainNetDefFormat(&buf, src->data.net, xmlopt, flags); - break; - case VIR_DOMAIN_DEVICE_INPUT: - rc =3D virDomainInputDefFormat(&buf, src->data.input, flags); - break; - case VIR_DOMAIN_DEVICE_SOUND: - rc =3D virDomainSoundDefFormat(&buf, src->data.sound, flags); - break; - case VIR_DOMAIN_DEVICE_VIDEO: - rc =3D virDomainVideoDefFormat(&buf, src->data.video, flags); - break; - case VIR_DOMAIN_DEVICE_HOSTDEV: - rc =3D virDomainHostdevDefFormat(&buf, src->data.hostdev, flags, x= mlopt); - break; - case VIR_DOMAIN_DEVICE_WATCHDOG: - rc =3D virDomainWatchdogDefFormat(&buf, src->data.watchdog, flags); - break; - case VIR_DOMAIN_DEVICE_CONTROLLER: - rc =3D virDomainControllerDefFormat(&buf, src->data.controller, fl= ags); - break; - case VIR_DOMAIN_DEVICE_GRAPHICS: - rc =3D virDomainGraphicsDefFormat(&buf, src->data.graphics, flags); - break; - case VIR_DOMAIN_DEVICE_HUB: - rc =3D virDomainHubDefFormat(&buf, src->data.hub, flags); - break; - case VIR_DOMAIN_DEVICE_REDIRDEV: - rc =3D virDomainRedirdevDefFormat(&buf, src->data.redirdev, flags); - break; - case VIR_DOMAIN_DEVICE_RNG: - rc =3D virDomainRNGDefFormat(&buf, src->data.rng, flags); - break; - case VIR_DOMAIN_DEVICE_CHR: - rc =3D virDomainChrDefFormat(&buf, src->data.chr, flags); - break; - case VIR_DOMAIN_DEVICE_TPM: - virDomainTPMDefFormat(&buf, src->data.tpm, flags, xmlopt); - rc =3D 0; - break; - case VIR_DOMAIN_DEVICE_PANIC: - virDomainPanicDefFormat(&buf, src->data.panic); - rc =3D 0; - break; - case VIR_DOMAIN_DEVICE_MEMORY: - rc =3D virDomainMemoryDefFormat(&buf, src->data.memory, flags); - break; - case VIR_DOMAIN_DEVICE_SHMEM: - virDomainShmemDefFormat(&buf, src->data.shmem, flags); - rc =3D 0; - break; - case VIR_DOMAIN_DEVICE_IOMMU: - virDomainIOMMUDefFormat(&buf, src->data.iommu); - rc =3D 0; - break; - case VIR_DOMAIN_DEVICE_VSOCK: - virDomainVsockDefFormat(&buf, src->data.vsock); - rc =3D 0; - break; - case VIR_DOMAIN_DEVICE_AUDIO: - rc =3D virDomainAudioDefFormat(&buf, src->data.audio); - break; - - case VIR_DOMAIN_DEVICE_NONE: - case VIR_DOMAIN_DEVICE_SMARTCARD: - case VIR_DOMAIN_DEVICE_MEMBALLOON: - case VIR_DOMAIN_DEVICE_NVRAM: - case VIR_DOMAIN_DEVICE_LAST: - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Copying definition of '%d' type " - "is not implemented yet."), - src->type); - return NULL; - } - - if (rc < 0) - return NULL; - - xmlStr =3D virBufferContentAndReset(&buf); - return virDomainDeviceDefParse(xmlStr, def, xmlopt, parseOpaque, - VIR_DOMAIN_DEF_PARSE_INACTIVE | - VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE); -} - - virSecurityLabelDef * virDomainDefGetSecurityLabelDef(const virDomainDef *def, const char *model) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a9f7e8d977..c19dfc5470 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3471,10 +3471,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainShmemDef, vir= DomainShmemDefFree); void virDomainDeviceDefFree(virDomainDeviceDef *def); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainDeviceDef, virDomainDeviceDefFree); -virDomainDeviceDef *virDomainDeviceDefCopy(virDomainDeviceDef *src, - const virDomainDef *def, - virDomainXMLOption *xmlopt, - void *parseOpaque); virDomainDeviceInfo *virDomainDeviceGetInfo(const virDomainDeviceDef *devi= ce); void virDomainDeviceSetData(virDomainDeviceDef *device, void *devicedata); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index ebd7bc61a8..fd79a9d440 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -353,7 +353,6 @@ virDomainDefSetVcpusMax; virDomainDefVcpuOrderClear; virDomainDeleteConfig; virDomainDeviceAliasIsUserAlias; -virDomainDeviceDefCopy; virDomainDeviceDefFree; virDomainDeviceDefParse; virDomainDeviceFindSCSIController; --=20 2.37.3