[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 1/7] pci: Clean up error checking in pci_add_capa
From: |
Mao Zhongyi |
Subject: |
[Qemu-devel] [PATCH v4 1/7] pci: Clean up error checking in pci_add_capability() |
Date: |
Fri, 9 Jun 2017 19:24:36 +0800 |
On success, pci_add_capability2() returns a positive value. On
failure, it sets an error and return a negative value.
pci_add_capability() laboriously checks this behavior. No other
caller does. Drop the checks from pci_add_capability().
Cc: address@hidden
Cc: address@hidden
Signed-off-by: Mao Zhongyi <address@hidden>
Reviewed-by: Marcel Apfelbaum <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 98ccc27..53566b8 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -2270,12 +2270,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
- [Qemu-devel] [PATCH v4 0/7] Convert to realize and cleanup, Mao Zhongyi, 2017/06/09
- [Qemu-devel] [PATCH v4 2/7] pci: Add comment for pci_add_capability2(), Mao Zhongyi, 2017/06/09
- [Qemu-devel] [PATCH v4 5/7] pci: Replace pci_add_capability() with pci_add_capability2(), Mao Zhongyi, 2017/06/09
- [Qemu-devel] [PATCH v4 1/7] pci: Clean up error checking in pci_add_capability(),
Mao Zhongyi <=
- [Qemu-devel] [PATCH v4 7/7] pci: Convert shpc_init() to Error, Mao Zhongyi, 2017/06/09
- [Qemu-devel] [PATCH v4 4/7] pci: Make errp the last parameter of pci_add_capability(), Mao Zhongyi, 2017/06/09
- [Qemu-devel] [PATCH v4 6/7] pci: Convert to realize, Mao Zhongyi, 2017/06/09
- [Qemu-devel] [PATCH v4 3/7] pci: Fix the return value checking, Mao Zhongyi, 2017/06/09