[Qemu-devel] [PATCH] pci: Fix unreasonable return value check

[Mao Zhongyi]

The return value of pci_add_capability2() is only 2 cases, positive
on success, nagetive on failure and set error message to Error. In
other worlds, If Error is filled, the return value must be nagetive.
There is no case where errp is set but the return value is a positive.
But pci_add_capability() does. So the return value check is illogical.

Meanwhile, all other callers of pci_add_capability2() do the same
check as this patch. So fix it.

Signed-off-by: Mao Zhongyi <address@hidden>
---
 hw/pci/pci.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 259483b..1faf060 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -2269,12 +2269,8 @@ int pci_add_capability(PCIDevice *pdev, uint8_t cap_id,
     Error *local_err = NULL;
 
     ret = pci_add_capability2(pdev, cap_id, offset, size, &local_err);
-    if (local_err) {
-        assert(ret < 0);
+    if (ret < 0) {
         error_report_err(local_err);
-    } else {
-        /* success implies a positive offset in config space */
-        assert(ret > 0);
     }
     return ret;
 }
-- 
2.9.3