From 5031bb2cd6aad3eb29fc413ce1947e158b50cae8 Mon Sep 17 00:00:00 2001 From: Anya Harter Date: Fri, 29 Jun 2018 11:03:25 -0400 Subject: [PATCH] domain_addr: delete virDomainVirtioSerialAddrRelease the last use of this function was deleted in commit 19a148b7c8353d5c214bed699f8fe983317baf93 Signed-off-by: Anya Harter --- 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 55899351d1..fd66a74e9d 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1607,50 +1607,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 cbf04bf54c..2764070cd2 100644 --- a/src/conf/domain_addr.h +++ b/src/conf/domain_addr.h @@ -258,11 +258,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; -- GitLab