[libvirt] [PATCH 0/2] domain_addr: delete unused functions
each commit references the commit where the last use was removed Anya Harter (2): domain_addr: delete virDomainCCWAddressReleaseAddr domain_addr: delete virDomainVirtioSerialAddrRelease src/conf/domain_addr.c | 68 ---------------------------------------- src/conf/domain_addr.h | 8 ----- src/libvirt_private.syms | 2 -- 3 files changed, 78 deletions(-) -- 2.17.1
the last use of this function was deleted in commit 1aa5e66cf3a0dd5e8ada8483f79cb745f786a131 Signed-off-by: Anya Harter <aharter@redhat.com> --- 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 ATTRIBUTE_UNUSED, return virDomainCCWAddressAssign(info, data, false); } -int -virDomainCCWAddressReleaseAddr(virDomainCCWAddressSetPtr addrs, - virDomainDeviceInfoPtr dev) -{ - char *addr; - int ret; - - addr = virDomainCCWAddressAsString(&(dev->addr.ccw)); - if (!addr) - return -1; - - if ((ret = virHashRemoveEntry(addrs->defined, addr)) == 0 && - dev->addr.ccw.cssid == addrs->next.cssid && - dev->addr.ccw.ssid == addrs->next.ssid && - dev->addr.ccw.devno < addrs->next.devno) { - addrs->next.devno = dev->addr.ccw.devno; - addrs->next.assigned = 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); -int virDomainCCWAddressReleaseAddr(virDomainCCWAddressSetPtr addrs, - virDomainDeviceInfoPtr dev) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); virDomainCCWAddressSetPtr virDomainCCWAddressSetCreate(void); 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; -- 2.17.1
the last use of this function was deleted in commit 19a148b7c8353d5c214bed699f8fe983317baf93 Signed-off-by: Anya Harter <aharter@redhat.com> --- 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; } -/* virDomainVirtioSerialAddrRelease - * - * Release the virtio serial address of the device - */ -int -virDomainVirtioSerialAddrRelease(virDomainVirtioSerialAddrSetPtr addrs, - virDomainDeviceInfoPtr info) -{ - virBitmapPtr map; - char *str = NULL; - int ret = -1; - ssize_t i; - - if (info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL || - info->addr.vioserial.port == 0) - return 0; - - VIR_DEBUG("Releasing virtio serial %u %u", info->addr.vioserial.controller, - info->addr.vioserial.port); - - i = virDomainVirtioSerialAddrFindController(addrs, info->addr.vioserial.controller); - if (i < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("virtio serial controller %u is missing"), - info->addr.vioserial.controller); - goto cleanup; - } - - map = 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 = 0; - - cleanup: - VIR_FREE(str); - return ret; -} - 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); -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; -- 2.17.1
On 06/29/2018 11:03 AM, Anya Harter wrote:
each commit references the commit where the last use was removed
Anya Harter (2): domain_addr: delete virDomainCCWAddressReleaseAddr domain_addr: delete virDomainVirtioSerialAddrRelease
src/conf/domain_addr.c | 68 ---------------------------------------- src/conf/domain_addr.h | 8 ----- src/libvirt_private.syms | 2 -- 3 files changed, 78 deletions(-)
Reviewed-by: John Ferlan <jferlan@redhat.com> (series, and pushed) John
participants (2)
-
Anya Harter -
John Ferlan