[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 11/16] msix: Omit errp for pci_add_capability
From: |
Akihiko Odaki |
Subject: |
[PATCH v3 11/16] msix: Omit errp for pci_add_capability |
Date: |
Thu, 27 Oct 2022 05:15:22 +0900 |
Omitting errp for pci_add_capability() causes it to abort if
capabilities overlap. A caller of msix_init(), which calls
pci_add_capability() in turn, is expected to ensure that will not
happen.
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
---
hw/pci/msix.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/hw/pci/msix.c b/hw/pci/msix.c
index 1e381a9813..28af83403b 100644
--- a/hw/pci/msix.c
+++ b/hw/pci/msix.c
@@ -311,7 +311,7 @@ int msix_init(struct PCIDevice *dev, unsigned short
nentries,
uint8_t pba_bar_nr, unsigned pba_offset, uint8_t cap_pos,
Error **errp)
{
- int cap;
+ uint8_t cap;
unsigned table_size, pba_size;
uint8_t *config;
@@ -340,11 +340,7 @@ int msix_init(struct PCIDevice *dev, unsigned short
nentries,
return -EINVAL;
}
- cap = pci_add_capability(dev, PCI_CAP_ID_MSIX,
- cap_pos, MSIX_CAP_LENGTH, errp);
- if (cap < 0) {
- return cap;
- }
+ cap = pci_add_capability(dev, PCI_CAP_ID_MSIX, cap_pos, MSIX_CAP_LENGTH);
dev->msix_cap = cap;
dev->cap_present |= QEMU_PCI_CAP_MSIX;
--
2.37.3
- [PATCH v3 00/16] pci: Abort if pci_add_capability fails, Akihiko Odaki, 2022/10/26
- [PATCH v3 01/16] pci: Allow to omit errp for pci_add_capability, Akihiko Odaki, 2022/10/26
- [PATCH v3 02/16] hw/i386/amd_iommu: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/26
- [PATCH v3 03/16] ahci: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/26
- [PATCH v3 05/16] eepro100: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/26
- [PATCH v3 04/16] e1000e: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/26
- [PATCH v3 07/16] msi: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/26
- [PATCH v3 06/16] hw/nvme: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/26
- [PATCH v3 11/16] msix: Omit errp for pci_add_capability,
Akihiko Odaki <=
- [PATCH v3 13/16] hw/pci-bridge/pcie_pci_bridge: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/26
- [PATCH v3 09/16] pcie: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/26
- [PATCH v3 10/16] pci/shpc: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/26
- [PATCH v3 12/16] pci/slotid: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/26
- [PATCH v3 08/16] hw/pci/pci_bridge: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/26
- [PATCH v3 14/16] hw/vfio/pci: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/26
- [PATCH v3 15/16] virtio-pci: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/26
- [PATCH v3 16/16] pci: Remove legacy errp from pci_add_capability, Akihiko Odaki, 2022/10/26