Adjust method name virDomainDeviceCCWAddressParseXML to virCCWDeviceAddressParseXML. Signed-off-by: Boris Fiuczynski <fiuczy@xxxxxxxxxxxxx> --- src/conf/device_conf.c | 4 ++-- src/conf/device_conf.h | 4 ++-- src/conf/domain_conf.c | 3 +-- src/libvirt_private.syms | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index 958e2f43cc..e93fd57341 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -259,8 +259,8 @@ virPCIDeviceAddressFormat(virBuffer *buf, } int -virDomainDeviceCCWAddressParseXML(xmlNodePtr node, - virCCWDeviceAddress *addr) +virCCWDeviceAddressParseXML(xmlNodePtr node, + virCCWDeviceAddress *addr) { int cssid; int ssid; diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index 01e2edccc9..910e6b7792 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -193,8 +193,8 @@ void virPCIDeviceAddressFormat(virBuffer *buf, virPCIDeviceAddress addr, bool includeTypeInAddr); -int virDomainDeviceCCWAddressParseXML(xmlNodePtr node, - virCCWDeviceAddress *addr); +int virCCWDeviceAddressParseXML(xmlNodePtr node, + virCCWDeviceAddress *addr); int virDomainDeviceDriveAddressParseXML(xmlNodePtr node, virDomainDeviceDriveAddress *addr); diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 826ba4183d..73970e488e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6720,8 +6720,7 @@ virDomainDeviceAddressParseXML(xmlNodePtr address, break; case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW: - if (virDomainDeviceCCWAddressParseXML - (address, &info->addr.ccw) < 0) + if (virCCWDeviceAddressParseXML(address, &info->addr.ccw) < 0) return -1; break; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 019f7c60e4..09867b7876 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -124,6 +124,7 @@ virCPUModeTypeToString; # conf/device_conf.h +virCCWDeviceAddressParseXML; virDeviceInfoPCIAddressExtensionIsPresent; virDeviceInfoPCIAddressExtensionIsWanted; virDeviceInfoPCIAddressIsPresent; @@ -131,7 +132,6 @@ virDeviceInfoPCIAddressIsWanted; virDomainDeviceAddressIsValid; virDomainDeviceAddressTypeToString; virDomainDeviceCcidAddressParseXML; -virDomainDeviceCCWAddressParseXML; virDomainDeviceDriveAddressParseXML; virDomainDeviceInfoAddressIsEqual; virDomainDeviceSpaprVioAddressParseXML; -- 2.33.1