[libvirt] [PATCH 2/4] domain_addr: make virDomainCCWAddress funcs static
Allocate, Validate, SetCreate
last uses of these functions outside domain_addr.c removed in commit:
7bdd06b4e103269992122603949f585fc2bfdc6
Signed-off-by: Anya Harter <aharter(a)redhat.com>
---
src/conf/domain_addr.c | 6 +++---
src/conf/domain_addr.h | 12 ------------
src/libvirt_private.syms | 3 ---
3 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
index ec2dfdbbdc..1922412853 100644
--- a/src/conf/domain_addr.c
+++ b/src/conf/domain_addr.c
@@ -1134,7 +1134,7 @@ virDomainCCWAddressAssign(virDomainDeviceInfoPtr dev,
return ret;
}
-int
+static int ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4)
virDomainCCWAddressAllocate(virDomainDefPtr def ATTRIBUTE_UNUSED,
virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED,
virDomainDeviceInfoPtr info,
@@ -1143,7 +1143,7 @@ virDomainCCWAddressAllocate(virDomainDefPtr def ATTRIBUTE_UNUSED,
return virDomainCCWAddressAssign(info, data, true);
}
-int
+static int ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4)
virDomainCCWAddressValidate(virDomainDefPtr def ATTRIBUTE_UNUSED,
virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED,
virDomainDeviceInfoPtr info,
@@ -1161,7 +1161,7 @@ void virDomainCCWAddressSetFree(virDomainCCWAddressSetPtr addrs)
VIR_FREE(addrs);
}
-virDomainCCWAddressSetPtr
+static virDomainCCWAddressSetPtr
virDomainCCWAddressSetCreate(void)
{
virDomainCCWAddressSetPtr addrs = NULL;
diff --git a/src/conf/domain_addr.h b/src/conf/domain_addr.h
index fc87c14eba..fc5ddcf6f1 100644
--- a/src/conf/domain_addr.h
+++ b/src/conf/domain_addr.h
@@ -186,18 +186,6 @@ int virDomainCCWAddressAssign(virDomainDeviceInfoPtr dev,
bool autoassign)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
void virDomainCCWAddressSetFree(virDomainCCWAddressSetPtr addrs);
-int virDomainCCWAddressAllocate(virDomainDefPtr def,
- virDomainDeviceDefPtr dev,
- virDomainDeviceInfoPtr info,
- void *data)
- ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4);
-int virDomainCCWAddressValidate(virDomainDefPtr def,
- virDomainDeviceDefPtr dev,
- virDomainDeviceInfoPtr info,
- void *data)
- ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4);
-
-virDomainCCWAddressSetPtr virDomainCCWAddressSetCreate(void);
virDomainCCWAddressSetPtr
virDomainCCWAddressSetCreateFromDomain(virDomainDefPtr def)
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 7000620b41..fef38d29fa 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -104,12 +104,9 @@ virPCIDeviceAddressParseXML;
# conf/domain_addr.h
-virDomainCCWAddressAllocate;
virDomainCCWAddressAssign;
-virDomainCCWAddressSetCreate;
virDomainCCWAddressSetCreateFromDomain;
virDomainCCWAddressSetFree;
-virDomainCCWAddressValidate;
virDomainPCIAddressAsString;
virDomainPCIAddressBusIsFullyReserved;
virDomainPCIAddressBusSetModel;
--
2.17.1