External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-09 06:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Remove CCW,PCI clear address helpers

Browse Source 
Since commit id 'fb06350' these are no longer called, so remove them
This commit is contained in:
John Ferlan 2016-07-19 08:06:49 -04:00
parent eee7bd4ecb
commit d95f5beb79
3 changed files with 0 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/conf/domain_conf.c
View File

@ -3361,31 +3361,6 @@ static int virDomainDeviceInfoClearAlias(virDomainDefPtr def ATTRIBUTE_UNUSED,
return 0; 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 static int
virDomainDeviceInfoIterateInternal(virDomainDefPtr def, virDomainDeviceInfoIterateInternal(virDomainDefPtr def,
virDomainDeviceInfoCallback cb, 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) void virDomainDefClearDeviceAliases(virDomainDefPtr def)
{ {
virDomainDeviceInfoIterate(def, virDomainDeviceInfoClearAlias, NULL); virDomainDeviceInfoIterate(def, virDomainDeviceInfoClearAlias, NULL);

2
src/conf/domain_conf.h
View File

@ -2534,8 +2534,6 @@ virDomainDeviceInfoPtr virDomainDeviceGetInfo(virDomainDeviceDefPtr device);
int virDomainDeviceInfoCopy(virDomainDeviceInfoPtr dst, int virDomainDeviceInfoCopy(virDomainDeviceInfoPtr dst,
virDomainDeviceInfoPtr src); virDomainDeviceInfoPtr src);
void virDomainDeviceInfoClear(virDomainDeviceInfoPtr info); void virDomainDeviceInfoClear(virDomainDeviceInfoPtr info);
void virDomainDefClearPCIAddresses(virDomainDefPtr def);
void virDomainDefClearCCWAddresses(virDomainDefPtr def);
void virDomainDefClearDeviceAliases(virDomainDefPtr def); void virDomainDefClearDeviceAliases(virDomainDefPtr def);
void virDomainTPMDefFree(virDomainTPMDefPtr def); void virDomainTPMDefFree(virDomainTPMDefPtr def);

2
src/libvirt_private.syms
View File

@ -219,9 +219,7 @@ virDomainDefAddController;
virDomainDefAddImplicitDevices; virDomainDefAddImplicitDevices;
virDomainDefAddUSBController; virDomainDefAddUSBController;
virDomainDefCheckABIStability; virDomainDefCheckABIStability;
virDomainDefClearCCWAddresses;
virDomainDefClearDeviceAliases; virDomainDefClearDeviceAliases;
virDomainDefClearPCIAddresses;
virDomainDefCompatibleDevice; virDomainDefCompatibleDevice;
virDomainDefCopy; virDomainDefCopy;
virDomainDefFindDevice; virDomainDefFindDevice;