Re: [PATCH v2 5/8] pcie_sriov: unregister_vfs(): fix error path

[Vladimir Sementsov-Ogievskiy]

[add Markus]

On 26.09.23 23:15, Vladimir Sementsov-Ogievskiy wrote:

local_err must be NULL before calling object_property_set_bool(), so we
must clear it on each iteration. Let's also use more convenient
error_reportf_err().

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@yandex-team.ru>
---
  hw/pci/pcie_sriov.c | 9 +++------
  1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/hw/pci/pcie_sriov.c b/hw/pci/pcie_sriov.c
index 76a3b6917e..5ef8950940 100644
--- a/hw/pci/pcie_sriov.c
+++ b/hw/pci/pcie_sriov.c
@@ -196,19 +196,16 @@ static void register_vfs(PCIDevice *dev)

static void unregister_vfs(PCIDevice *dev)

  {
-    Error *local_err = NULL;
      uint16_t num_vfs = dev->exp.sriov_pf.num_vfs;
      uint16_t i;

trace_sriov_unregister_vfs(dev->name, PCI_SLOT(dev->devfn),

                                 PCI_FUNC(dev->devfn), num_vfs);
      for (i = 0; i < num_vfs; i++) {
+        Error *err = NULL;
          PCIDevice *vf = dev->exp.sriov_pf.vf[i];
-        object_property_set_bool(OBJECT(vf), "realized", false, &local_err);
-        if (local_err) {
-            fprintf(stderr, "Failed to unplug: %s\n",
-                    error_get_pretty(local_err));
-            error_free(local_err);
+        if (!object_property_set_bool(OBJECT(vf), "realized", false, &err)) {
+            error_reportf_err(err, "Failed to unplug: ");
          }
          object_unparent(OBJECT(vf));
          object_unref(OBJECT(vf));

--
Best regards,
Vladimir