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>

diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index c68ac3af78791364c07f01714d98770d07c14693..b8c91d6ecda5b18b3d2ec0a0034dc95b3a45a950 100644 (file)
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -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;

diff --git a/tests/virpcitest.c b/tests/virpcitest.c
index d69a1b511834f7598598b83a79ba256d2f33549d..017c283a44414bba5eeba82f169e969378550bf6 100644 (file)
--- a/tests/virpcitest.c
+++ b/tests/virpcitest.c
@@ -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)