[libvirt] [PATCH 1/2] conf: Remove CCW,PCI clear address helpers
Since commit id 'fb06350' these are no longer called, so remove them
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/conf/domain_conf.c | 35 -----------------------------------
src/conf/domain_conf.h | 2 --
src/libvirt_private.syms | 2 --
3 files changed, 39 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 6dfcf81..132044f 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -3361,31 +3361,6 @@ static int virDomainDeviceInfoClearAlias(virDomainDefPtr def
ATTRIBUTE_UNUSED,
return 0;
}
-static int virDomainDeviceInfoClearPCIAddress(virDomainDefPtr def ATTRIBUTE_UNUSED,
- virDomainDeviceDefPtr device
ATTRIBUTE_UNUSED,
- virDomainDeviceInfoPtr info,
- void *opaque ATTRIBUTE_UNUSED)
-{
- if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) {
- memset(&info->addr, 0, sizeof(info->addr));
- info->type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE;
- }
- return 0;
-}
-
-static int
-virDomainDeviceInfoClearCCWAddress(virDomainDefPtr def ATTRIBUTE_UNUSED,
- virDomainDeviceDefPtr device ATTRIBUTE_UNUSED,
- virDomainDeviceInfoPtr info,
- void *opaque ATTRIBUTE_UNUSED)
-{
- if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) {
- memset(&info->addr, 0, sizeof(info->addr));
- info->type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE;
- }
- return 0;
-}
-
static int
virDomainDeviceInfoIterateInternal(virDomainDefPtr def,
virDomainDeviceInfoCallback cb,
@@ -4754,16 +4729,6 @@ virDomainDefValidate(virDomainDefPtr def,
}
-void virDomainDefClearPCIAddresses(virDomainDefPtr def)
-{
- virDomainDeviceInfoIterate(def, virDomainDeviceInfoClearPCIAddress, NULL);
-}
-
-void virDomainDefClearCCWAddresses(virDomainDefPtr def)
-{
- virDomainDeviceInfoIterate(def, virDomainDeviceInfoClearCCWAddress, NULL);
-}
-
void virDomainDefClearDeviceAliases(virDomainDefPtr def)
{
virDomainDeviceInfoIterate(def, virDomainDeviceInfoClearAlias, NULL);
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 00041c9..ac32468 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2534,8 +2534,6 @@ virDomainDeviceInfoPtr virDomainDeviceGetInfo(virDomainDeviceDefPtr
device);
int virDomainDeviceInfoCopy(virDomainDeviceInfoPtr dst,
virDomainDeviceInfoPtr src);
void virDomainDeviceInfoClear(virDomainDeviceInfoPtr info);
-void virDomainDefClearPCIAddresses(virDomainDefPtr def);
-void virDomainDefClearCCWAddresses(virDomainDefPtr def);
void virDomainDefClearDeviceAliases(virDomainDefPtr def);
void virDomainTPMDefFree(virDomainTPMDefPtr def);
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index cd3cc64..e15309a 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -209,9 +209,7 @@ virDomainDefAddController;
virDomainDefAddImplicitDevices;
virDomainDefAddUSBController;
virDomainDefCheckABIStability;
-virDomainDefClearCCWAddresses;
virDomainDefClearDeviceAliases;
-virDomainDefClearPCIAddresses;
virDomainDefCompatibleDevice;
virDomainDefCopy;
virDomainDefFindDevice;
--
2.5.5