From: John Ferlan <jferlan@redhat.com>
Date: Tue, 19 Jul 2016 12:06:49 +0000 (-0400)
Subject: conf: Remove CCW,PCI clear address helpers
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d95f5beb7948bc89ed1869cc0125c85f7fde0486;p=libvirt.git

conf: Remove CCW,PCI clear address helpers

Since commit id 'fb06350' these are no longer called, so remove them
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 6dfcf81e9e..132044f8a2 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 00041c90b0..ac32468e06 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 6b548129da..6693eed4d2 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -219,9 +219,7 @@ virDomainDefAddController;
 virDomainDefAddImplicitDevices;
 virDomainDefAddUSBController;
 virDomainDefCheckABIStability;
-virDomainDefClearCCWAddresses;
 virDomainDefClearDeviceAliases;
-virDomainDefClearPCIAddresses;
 virDomainDefCompatibleDevice;
 virDomainDefCopy;
 virDomainDefFindDevice;