mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 05:35:25 +00:00
virPCIDeviceGetVPD: Handle errors in callers
Until now 'virPCIDeviceGetVPD' couldn't reallistically raise an error, but that will change. Handle the errors by either resetting it if we'd be ignoring it or forward it. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
bac86dd36e
commit
e1dc851e7c
@ -3052,6 +3052,8 @@ virNodeDeviceGetPCIVPDDynamicCap(virNodeDevCapPCIDev *devCapPCIDev)
|
||||
if ((res = virPCIDeviceGetVPD(pciDev))) {
|
||||
devCapPCIDev->flags |= VIR_NODE_DEV_CAP_FLAG_PCI_VPD;
|
||||
devCapPCIDev->vpd = g_steal_pointer(&res);
|
||||
} else {
|
||||
virResetLastError();
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
|
@ -344,7 +344,8 @@ testVirPCIDeviceGetVPD(const void *opaque)
|
||||
if (!dev)
|
||||
return -1;
|
||||
|
||||
res = virPCIDeviceGetVPD(dev);
|
||||
if (!(res = virPCIDeviceGetVPD(dev)))
|
||||
return -1;
|
||||
|
||||
/* Only basic checks - full parser validation is done elsewhere. */
|
||||
if (res->ro == NULL)
|
||||
|
Loading…
Reference in New Issue
Block a user