aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMao Zhongyi <maozy.fnst@cn.fujitsu.com>2017-06-27 14:16:47 +0800
committerMichael S. Tsirkin <mst@redhat.com>2017-07-03 22:29:48 +0300
commit673b0d7ccc34e9617d99ed4c29caa964f19a4c5a (patch)
tree49a8653e0702315258e4667fd6623a83f5cb7fa2
parent8991c460be5a0811194fd4d2b49ba7146a23526b (diff)
pci: Clean up error checking in pci_add_capability()
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: mst@redhat.com Cc: marcel@redhat.com Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com> Reviewed-by: Marcel Apfelbaum <marcel@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-rw-r--r--hw/pci/pci.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index b7fee4bdf2..3c24888870 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;
}