[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 3/9] pci: Fix the wrong assertion.
From: |
Mao Zhongyi |
Subject: |
[Qemu-devel] [PATCH v6 3/9] pci: Fix the wrong assertion. |
Date: |
Tue, 20 Jun 2017 19:57:19 +0800 |
pci_add_capability returns a strictly positive value on success,
correct asserts.
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Signed-off-by: Mao Zhongyi <address@hidden>
---
hw/net/e1000e.c | 2 +-
hw/net/eepro100.c | 2 +-
hw/usb/hcd-xhci.c | 2 +-
hw/vfio/pci.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c
index 6e23493..8259d67 100644
--- a/hw/net/e1000e.c
+++ b/hw/net/e1000e.c
@@ -374,7 +374,7 @@ e1000e_add_pm_capability(PCIDevice *pdev, uint8_t offset,
uint16_t pmc)
{
int ret = pci_add_capability(pdev, PCI_CAP_ID_PM, offset, PCI_PM_SIZEOF);
- if (ret >= 0) {
+ if (ret > 0) {
pci_set_word(pdev->config + offset + PCI_PM_PMC,
PCI_PM_CAP_VER_1_1 |
pmc);
diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c
index 4bf71f2..da36816 100644
--- a/hw/net/eepro100.c
+++ b/hw/net/eepro100.c
@@ -571,7 +571,7 @@ static void e100_pci_reset(EEPRO100State * s)
int cfg_offset = 0xdc;
int r = pci_add_capability(&s->dev, PCI_CAP_ID_PM,
cfg_offset, PCI_PM_SIZEOF);
- assert(r >= 0);
+ assert(r > 0);
pci_set_word(pci_conf + cfg_offset + PCI_PM_PMC, 0x7e21);
#if 0 /* TODO: replace dummy code for power management emulation. */
/* TODO: Power Management Control / Status. */
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index a0c7960..ab42f86 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -3417,7 +3417,7 @@ static void usb_xhci_realize(struct PCIDevice *dev, Error
**errp)
if (pci_bus_is_express(dev->bus) ||
xhci_get_flag(xhci, XHCI_FLAG_FORCE_PCIE_ENDCAP)) {
ret = pcie_endpoint_cap_init(dev, 0xa0);
- assert(ret >= 0);
+ assert(ret > 0);
}
if (xhci->msix != ON_OFF_AUTO_OFF) {
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 32aca77..5881968 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -1744,7 +1744,7 @@ static int vfio_setup_pcie_cap(VFIOPCIDevice *vdev, int
pos, uint8_t size,
}
pos = pci_add_capability(&vdev->pdev, PCI_CAP_ID_EXP, pos, size);
- if (pos >= 0) {
+ if (pos > 0) {
vdev->pdev.exp.exp_cap = pos;
}
--
2.9.3
- [Qemu-devel] [PATCH v6 0/9] Convert to realize and cleanup, Mao Zhongyi, 2017/06/20
- [Qemu-devel] [PATCH v6 1/9] pci: Clean up error checking in pci_add_capability(), Mao Zhongyi, 2017/06/20
- [Qemu-devel] [PATCH v6 2/9] pci: Add comment for pci_add_capability2(), Mao Zhongyi, 2017/06/20
- [Qemu-devel] [PATCH v6 5/9] pci: Replace pci_add_capability2() with pci_add_capability(), Mao Zhongyi, 2017/06/20
- [Qemu-devel] [PATCH v6 7/9] pci: Convert shpc_init() to Error, Mao Zhongyi, 2017/06/20
- [Qemu-devel] [PATCH v6 8/9] i386/kvm/pci-assign: Fix return type of verify_irqchip_kernel(), Mao Zhongyi, 2017/06/20
- [Qemu-devel] [PATCH v6 9/9] i386/kvm/pci-assign: Use errp directly rather than local_err, Mao Zhongyi, 2017/06/20
- [Qemu-devel] [PATCH v6 6/9] pci: Convert to realize, Mao Zhongyi, 2017/06/20
- [Qemu-devel] [PATCH v6 3/9] pci: Fix the wrong assertion.,
Mao Zhongyi <=
- [Qemu-devel] [PATCH v6 4/9] pci: Make errp the last parameter of pci_add_capability(), Mao Zhongyi, 2017/06/20