From nobody Fri May 10 20:14:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1530284619171631.8879716977234; Fri, 29 Jun 2018 08:03:39 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 36DEDC058CA5; Fri, 29 Jun 2018 15:03:37 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DC4C189F07; Fri, 29 Jun 2018 15:03:36 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8266818037F0; Fri, 29 Jun 2018 15:03:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w5TF3XvQ000327 for ; Fri, 29 Jun 2018 11:03:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id D7EC82027047; Fri, 29 Jun 2018 15:03:33 +0000 (UTC) Received: from dhcp-17-130.bos.redhat.com (dhcp-17-130.bos.redhat.com [10.18.17.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id BF6F12026D68; Fri, 29 Jun 2018 15:03:33 +0000 (UTC) From: Anya Harter To: libvir-list@redhat.com Date: Fri, 29 Jun 2018 11:03:24 -0400 Message-Id: <3ce9efa46d931197612a4c95152ab835806d3cff.1530284408.git.aharter@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: Anya Harter Subject: [libvirt] [PATCH 1/2] domain_addr: delete virDomainCCWAddressReleaseAddr X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 29 Jun 2018 15:03:38 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" the last use of this function was deleted in commit 1aa5e66cf3a0dd5e8ada8483f79cb745f786a131 Signed-off-by: Anya Harter Reviewed-by: John Ferlan --- src/conf/domain_addr.c | 24 ------------------------ src/conf/domain_addr.h | 3 --- src/libvirt_private.syms | 1 - 3 files changed, 28 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 5730b3b859..9786adf937 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1152,30 +1152,6 @@ virDomainCCWAddressValidate(virDomainDefPtr def ATTR= IBUTE_UNUSED, return virDomainCCWAddressAssign(info, data, false); } =20 -int -virDomainCCWAddressReleaseAddr(virDomainCCWAddressSetPtr addrs, - virDomainDeviceInfoPtr dev) -{ - char *addr; - int ret; - - addr =3D virDomainCCWAddressAsString(&(dev->addr.ccw)); - if (!addr) - return -1; - - if ((ret =3D virHashRemoveEntry(addrs->defined, addr)) =3D=3D 0 && - dev->addr.ccw.cssid =3D=3D addrs->next.cssid && - dev->addr.ccw.ssid =3D=3D addrs->next.ssid && - dev->addr.ccw.devno < addrs->next.devno) { - addrs->next.devno =3D dev->addr.ccw.devno; - addrs->next.assigned =3D false; - } - - VIR_FREE(addr); - - return ret; -} - void virDomainCCWAddressSetFree(virDomainCCWAddressSetPtr addrs) { if (!addrs) diff --git a/src/conf/domain_addr.h b/src/conf/domain_addr.h index 35530e464c..2db649484a 100644 --- a/src/conf/domain_addr.h +++ b/src/conf/domain_addr.h @@ -200,9 +200,6 @@ int virDomainCCWAddressValidate(virDomainDefPtr def, void *data) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); =20 -int virDomainCCWAddressReleaseAddr(virDomainCCWAddressSetPtr addrs, - virDomainDeviceInfoPtr dev) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); virDomainCCWAddressSetPtr virDomainCCWAddressSetCreate(void); =20 virDomainCCWAddressSetPtr diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 5499a368c0..cd2e4280ab 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -106,7 +106,6 @@ virPCIDeviceAddressParseXML; # conf/domain_addr.h virDomainCCWAddressAllocate; virDomainCCWAddressAssign; -virDomainCCWAddressReleaseAddr; virDomainCCWAddressSetCreate; virDomainCCWAddressSetFree; virDomainCCWAddressValidate; --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 10 20:14:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1530284620503723.6607758602837; Fri, 29 Jun 2018 08:03:40 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 705783001D3B; Fri, 29 Jun 2018 15:03:39 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 328F6308BDB0; Fri, 29 Jun 2018 15:03:39 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 73E9B4A460; Fri, 29 Jun 2018 15:03:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w5TF3aNL000346 for ; Fri, 29 Jun 2018 11:03:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6B3972026D6A; Fri, 29 Jun 2018 15:03:36 +0000 (UTC) Received: from dhcp-17-130.bos.redhat.com (dhcp-17-130.bos.redhat.com [10.18.17.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5240F2026D68; Fri, 29 Jun 2018 15:03:36 +0000 (UTC) From: Anya Harter To: libvir-list@redhat.com Date: Fri, 29 Jun 2018 11:03:25 -0400 Message-Id: <134dcb8282b8e4da7215de827a1d96239ef9700b.1530284408.git.aharter@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: Anya Harter Subject: [libvirt] [PATCH 2/2] domain_addr: delete virDomainVirtioSerialAddrRelease X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Fri, 29 Jun 2018 15:03:40 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" the last use of this function was deleted in commit 19a148b7c8353d5c214bed699f8fe983317baf93 Signed-off-by: Anya Harter Reviewed-by: John Ferlan --- src/conf/domain_addr.c | 44 ---------------------------------------- src/conf/domain_addr.h | 5 ----- src/libvirt_private.syms | 1 - 3 files changed, 50 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 9786adf937..271696ba3a 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1631,50 +1631,6 @@ virDomainVirtioSerialAddrReserve(virDomainDefPtr def= ATTRIBUTE_UNUSED, return ret; } =20 -/* virDomainVirtioSerialAddrRelease - * - * Release the virtio serial address of the device - */ -int -virDomainVirtioSerialAddrRelease(virDomainVirtioSerialAddrSetPtr addrs, - virDomainDeviceInfoPtr info) -{ - virBitmapPtr map; - char *str =3D NULL; - int ret =3D -1; - ssize_t i; - - if (info->type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL || - info->addr.vioserial.port =3D=3D 0) - return 0; - - VIR_DEBUG("Releasing virtio serial %u %u", info->addr.vioserial.contro= ller, - info->addr.vioserial.port); - - i =3D virDomainVirtioSerialAddrFindController(addrs, info->addr.vioser= ial.controller); - if (i < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("virtio serial controller %u is missing"), - info->addr.vioserial.controller); - goto cleanup; - } - - map =3D addrs->controllers[i]->ports; - if (virBitmapClearBit(map, info->addr.vioserial.port) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("virtio serial controller %u does not have port %= u"), - info->addr.vioserial.controller, - info->addr.vioserial.port); - goto cleanup; - } - - ret =3D 0; - - cleanup: - VIR_FREE(str); - return ret; -} - =20 bool virDomainUSBAddressPortIsValid(unsigned int *port) diff --git a/src/conf/domain_addr.h b/src/conf/domain_addr.h index 2db649484a..bd7cf08e47 100644 --- a/src/conf/domain_addr.h +++ b/src/conf/domain_addr.h @@ -262,11 +262,6 @@ virDomainVirtioSerialAddrReserve(virDomainDefPtr def, void *data) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); =20 -int -virDomainVirtioSerialAddrRelease(virDomainVirtioSerialAddrSetPtr addrs, - virDomainDeviceInfoPtr info) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); - bool virDomainUSBAddressPortIsValid(unsigned int *port) ATTRIBUTE_NONNULL(1); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index cd2e4280ab..b87e81391a 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -139,7 +139,6 @@ virDomainVirtioSerialAddrAssign; virDomainVirtioSerialAddrAutoAssign; virDomainVirtioSerialAddrAutoAssignFromCache; virDomainVirtioSerialAddrIsComplete; -virDomainVirtioSerialAddrRelease; virDomainVirtioSerialAddrReserve; virDomainVirtioSerialAddrSetAddControllers; virDomainVirtioSerialAddrSetCreate; --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list