提交 6d9edcb8 编写于 作者: A Anya Harter 提交者: Pavel Hrdina

domain_addr: make virDomainCCWAddress funcs static

Allocate, Validate, SetCreate

    last uses of these functions outside domain_addr.c removed in commit:
        7bdd06b4Signed-off-by: NAnya Harter <aharter@redhat.com>
Reviewed-by: NPavel Hrdina <phrdina@redhat.com>
上级 3cb6821c
...@@ -1134,7 +1134,7 @@ virDomainCCWAddressAssign(virDomainDeviceInfoPtr dev, ...@@ -1134,7 +1134,7 @@ virDomainCCWAddressAssign(virDomainDeviceInfoPtr dev,
return ret; return ret;
} }
int static int ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4)
virDomainCCWAddressAllocate(virDomainDefPtr def ATTRIBUTE_UNUSED, virDomainCCWAddressAllocate(virDomainDefPtr def ATTRIBUTE_UNUSED,
virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED, virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED,
virDomainDeviceInfoPtr info, virDomainDeviceInfoPtr info,
...@@ -1143,7 +1143,7 @@ virDomainCCWAddressAllocate(virDomainDefPtr def ATTRIBUTE_UNUSED, ...@@ -1143,7 +1143,7 @@ virDomainCCWAddressAllocate(virDomainDefPtr def ATTRIBUTE_UNUSED,
return virDomainCCWAddressAssign(info, data, true); return virDomainCCWAddressAssign(info, data, true);
} }
int static int ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4)
virDomainCCWAddressValidate(virDomainDefPtr def ATTRIBUTE_UNUSED, virDomainCCWAddressValidate(virDomainDefPtr def ATTRIBUTE_UNUSED,
virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED, virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED,
virDomainDeviceInfoPtr info, virDomainDeviceInfoPtr info,
...@@ -1161,7 +1161,7 @@ void virDomainCCWAddressSetFree(virDomainCCWAddressSetPtr addrs) ...@@ -1161,7 +1161,7 @@ void virDomainCCWAddressSetFree(virDomainCCWAddressSetPtr addrs)
VIR_FREE(addrs); VIR_FREE(addrs);
} }
virDomainCCWAddressSetPtr static virDomainCCWAddressSetPtr
virDomainCCWAddressSetCreate(void) virDomainCCWAddressSetCreate(void)
{ {
virDomainCCWAddressSetPtr addrs = NULL; virDomainCCWAddressSetPtr addrs = NULL;
......
...@@ -186,18 +186,6 @@ int virDomainCCWAddressAssign(virDomainDeviceInfoPtr dev, ...@@ -186,18 +186,6 @@ int virDomainCCWAddressAssign(virDomainDeviceInfoPtr dev,
bool autoassign) bool autoassign)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
void virDomainCCWAddressSetFree(virDomainCCWAddressSetPtr addrs); 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 virDomainCCWAddressSetPtr
virDomainCCWAddressSetCreateFromDomain(virDomainDefPtr def) virDomainCCWAddressSetCreateFromDomain(virDomainDefPtr def)
......
...@@ -104,12 +104,9 @@ virPCIDeviceAddressParseXML; ...@@ -104,12 +104,9 @@ virPCIDeviceAddressParseXML;
# conf/domain_addr.h # conf/domain_addr.h
virDomainCCWAddressAllocate;
virDomainCCWAddressAssign; virDomainCCWAddressAssign;
virDomainCCWAddressSetCreate;
virDomainCCWAddressSetCreateFromDomain; virDomainCCWAddressSetCreateFromDomain;
virDomainCCWAddressSetFree; virDomainCCWAddressSetFree;
virDomainCCWAddressValidate;
virDomainPCIAddressAsString; virDomainPCIAddressAsString;
virDomainPCIAddressBusIsFullyReserved; virDomainPCIAddressBusIsFullyReserved;
virDomainPCIAddressBusSetModel; virDomainPCIAddressBusSetModel;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册