Commit 673b0d7c authored Jun 27, 2017 by Mao Zhongyi Committed by Michael S. Tsirkin Jul 03, 2017

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>

parent 8991c460

hw/pci/pci.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -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;
		}