From: Anya Harter <aharter@redhat.com>
Date: Fri, 29 Jun 2018 15:03:24 +0000 (-0400)
Subject: domain_addr: delete virDomainCCWAddressReleaseAddr
X-Git-Tag: v4.6.0-rc1~355
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=039802ca62679d775f54c39549bc48c90eb673e0;p=thirdparty%2Flibvirt.git

domain_addr: delete virDomainCCWAddressReleaseAddr

the last use of this function was deleted in commit
    1aa5e66cf3a0dd5e8ada8483f79cb745f786a131

Signed-off-by: Anya Harter <aharter@redhat.com>
---

diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
index 39f22b82eb..55899351d1 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 3236b7d6de..cbf04bf54c 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);
 
 struct _virDomainVirtioSerialController {
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;