External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: address: Remove dead code when un-reserving PCI address

Browse Source 
The code can't fail so having error handling is pointless.
This commit is contained in:
Peter Krempa 2017-10-18 16:12:53 +02:00
parent 537e86f031
commit a4bac46c96
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/conf/domain_addr.c
View File

@ -687,12 +687,11 @@ virDomainPCIAddressEnsureAddr(virDomainPCIAddressSetPtr addrs,
} }
int void
virDomainPCIAddressReleaseAddr(virDomainPCIAddressSetPtr addrs, virDomainPCIAddressReleaseAddr(virDomainPCIAddressSetPtr addrs,
virPCIDeviceAddressPtr addr) virPCIDeviceAddressPtr addr)
{ {
addrs->buses[addr->bus].slot[addr->slot].functions &= ~(1 << addr->function); addrs->buses[addr->bus].slot[addr->slot].functions &= ~(1 << addr->function);
return 0;
} }
virDomainPCIAddressSetPtr virDomainPCIAddressSetPtr

4
src/conf/domain_addr.h
View File

@ -166,8 +166,8 @@ int virDomainPCIAddressEnsureAddr(virDomainPCIAddressSetPtr addrs,
virDomainPCIConnectFlags flags) virDomainPCIConnectFlags flags)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
int virDomainPCIAddressReleaseAddr(virDomainPCIAddressSetPtr addrs, void virDomainPCIAddressReleaseAddr(virDomainPCIAddressSetPtr addrs,
virPCIDeviceAddressPtr addr) virPCIDeviceAddressPtr addr)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
void virDomainPCIAddressSetAllMulti(virDomainDefPtr def) void virDomainPCIAddressSetAllMulti(virDomainDefPtr def)

7
src/qemu/qemu_domain_address.c
View File

@ -2892,11 +2892,8 @@ qemuDomainReleaseDeviceAddress(virDomainObjPtr vm,
if (!devstr) if (!devstr)
devstr = info->alias; devstr = info->alias;
if (virDeviceInfoPCIAddressPresent(info) && if (virDeviceInfoPCIAddressPresent(info))
virDomainPCIAddressReleaseAddr(priv->pciaddrs, virDomainPCIAddressReleaseAddr(priv->pciaddrs, &info->addr.pci);
&info->addr.pci) < 0)
VIR_WARN("Unable to release PCI address on %s",
NULLSTR(devstr));
if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB && if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB &&
priv->usbaddrs && priv->usbaddrs &&