[libvirt] [PATCH 2/9] Remove unused virDomainVirtioSerialAddrSetRemoveController
This function was never used.
Also mark virDomainVirtioSerialAddrSetAddController as static.
---
src/conf/domain_addr.c | 23 +----------------------
src/conf/domain_addr.h | 8 --------
src/libvirt_private.syms | 2 --
3 files changed, 1 insertion(+), 32 deletions(-)
diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
index ca5803e..9883c4f 100644
--- a/src/conf/domain_addr.c
+++ b/src/conf/domain_addr.c
@@ -825,7 +825,7 @@
virDomainVirtioSerialAddrFindController(virDomainVirtioSerialAddrSetPtr addrs,
* Adds virtio serial ports of the existing controller
* to the address set.
*/
-int
+static int
virDomainVirtioSerialAddrSetAddController(virDomainVirtioSerialAddrSetPtr addrs,
virDomainControllerDefPtr cont)
{
@@ -884,27 +884,6 @@
virDomainVirtioSerialAddrSetAddControllers(virDomainVirtioSerialAddrSetPtr addrs
return 0;
}
-/* virDomainVirtioSerialAddrSetRemoveController
- *
- * Removes a virtio serial controller from the address set.
- */
-void
-virDomainVirtioSerialAddrSetRemoveController(virDomainVirtioSerialAddrSetPtr addrs,
- virDomainControllerDefPtr cont)
-{
- ssize_t pos;
-
- if (cont->type != VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL)
- return;
-
- VIR_DEBUG("Removing virtio serial controller index %u "
- "from the address set", cont->idx);
-
- pos = virDomainVirtioSerialAddrFindController(addrs, cont->idx);
-
- if (pos >= 0)
- VIR_DELETE_ELEMENT(addrs->controllers, pos, addrs->ncontrollers);
-}
void
virDomainVirtioSerialAddrSetFree(virDomainVirtioSerialAddrSetPtr addrs)
diff --git a/src/conf/domain_addr.h b/src/conf/domain_addr.h
index 2220a79..208635c 100644
--- a/src/conf/domain_addr.h
+++ b/src/conf/domain_addr.h
@@ -206,14 +206,6 @@ typedef virDomainVirtioSerialAddrSet
*virDomainVirtioSerialAddrSetPtr;
virDomainVirtioSerialAddrSetPtr
virDomainVirtioSerialAddrSetCreate(void);
int
-virDomainVirtioSerialAddrSetAddController(virDomainVirtioSerialAddrSetPtr addrs,
- virDomainControllerDefPtr cont)
- ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
-void
-virDomainVirtioSerialAddrSetRemoveController(virDomainVirtioSerialAddrSetPtr addrs,
- virDomainControllerDefPtr cont)
- ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
-int
virDomainVirtioSerialAddrSetAddControllers(virDomainVirtioSerialAddrSetPtr addrs,
virDomainDefPtr def)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 45f42f5..f1e5f48 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -111,11 +111,9 @@ virDomainVirtioSerialAddrAutoAssign;
virDomainVirtioSerialAddrIsComplete;
virDomainVirtioSerialAddrRelease;
virDomainVirtioSerialAddrReserve;
-virDomainVirtioSerialAddrSetAddController;
virDomainVirtioSerialAddrSetAddControllers;
virDomainVirtioSerialAddrSetCreate;
virDomainVirtioSerialAddrSetFree;
-virDomainVirtioSerialAddrSetRemoveController;
# conf/domain_audit.h
--
2.4.6