External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 09:55:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: make virPCIDeviceAddressFormat void

Browse Source 
Only one of the three callers of virPCIDeviceAddressFormat correctly
handles an error return status. Fortunately it can't fail so can be
made void.

Reviewed-by: Laine Stump <laine@laine.org>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2018-12-19 11:58:42 +00:00
parent aa4f3bbf2c
commit a470758468
5 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/conf/device_conf.c
View File

@ -308,7 +308,7 @@ virPCIDeviceAddressParseXML(xmlNodePtr node,
return ret;
}
int
void
virPCIDeviceAddressFormat(virBufferPtr buf,
virPCIDeviceAddress addr,
bool includeTypeInAddr)
@ -320,7 +320,6 @@ virPCIDeviceAddressFormat(virBufferPtr buf,
addr.bus,
addr.slot,
addr.function);
return 0;
}
bool

6
src/conf/device_conf.h
View File

@ -202,9 +202,9 @@ bool virDeviceInfoPCIAddressExtensionIsPresent(const virDomainDeviceInfo *info);
int virPCIDeviceAddressParseXML(xmlNodePtr node,
virPCIDeviceAddressPtr addr);
int virPCIDeviceAddressFormat(virBufferPtr buf,
virPCIDeviceAddress addr,
bool includeTypeInAddr);
void virPCIDeviceAddressFormat(virBufferPtr buf,
virPCIDeviceAddress addr,
bool includeTypeInAddr);
bool virDomainDeviceCCWAddressIsValid(virDomainDeviceCCWAddressPtr addr);
int virDomainDeviceCCWAddressParseXML(xmlNodePtr node,

6
src/conf/domain_conf.c
View File

@ -25136,10 +25136,8 @@ virDomainHostdevDefFormatSubsys(virBufferPtr buf,
}
break;
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
if (virPCIDeviceAddressFormat(buf, pcisrc->addr,
includeTypeInAddr) != 0)
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("PCI address Formatting failed"));
virPCIDeviceAddressFormat(buf, pcisrc->addr,
includeTypeInAddr);
if ((flags & VIR_DOMAIN_DEF_FORMAT_PCI_ORIG_STATES) &&
(def->origstates.states.pci.unbind_from_stub ||

7
src/conf/network_conf.c
View File

@ -2485,10 +2485,9 @@ virNetworkDefFormatBuf(virBufferPtr buf,
virBufferAddLit(buf, "/>\n");
} else {
if (def->forward.ifs[i].type == VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_PCI) {
if (virPCIDeviceAddressFormat(buf,
def->forward.ifs[i].device.pci,
true) < 0)
goto error;
virPCIDeviceAddressFormat(buf,
def->forward.ifs[i].device.pci,
true);
}
}
}

4
src/conf/storage_adapter_conf.c
View File

@ -326,8 +326,8 @@ virStorageAdapterFormatSCSIHost(virBufferPtr buf,
virBufferAsprintf(buf, "<parentaddr unique_id='%d'>\n",
scsi_host->unique_id);
virBufferAdjustIndent(buf, 2);
ignore_value(virPCIDeviceAddressFormat(buf, scsi_host->parentaddr,
false));
virPCIDeviceAddressFormat(buf, scsi_host->parentaddr,
false);
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</parentaddr>\n");
virBufferAdjustIndent(buf, -2);