[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 07/16] msi: Omit errp for pci_add_capability
From: |
Akihiko Odaki |
Subject: |
[PATCH v3 07/16] msi: Omit errp for pci_add_capability |
Date: |
Thu, 27 Oct 2022 05:15:18 +0900 |
Omitting errp for pci_add_capability() causes it to abort if
capabilities overlap. A caller of msi_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/msi.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/hw/pci/msi.c b/hw/pci/msi.c
index 058d1d1ef1..5283a08b5a 100644
--- a/hw/pci/msi.c
+++ b/hw/pci/msi.c
@@ -194,7 +194,6 @@ int msi_init(struct PCIDevice *dev, uint8_t offset,
unsigned int vectors_order;
uint16_t flags;
uint8_t cap_size;
- int config_offset;
if (!msi_nonbroken) {
error_setg(errp, "MSI is not supported by interrupt controller");
@@ -221,13 +220,7 @@ int msi_init(struct PCIDevice *dev, uint8_t offset,
}
cap_size = msi_cap_sizeof(flags);
- config_offset = pci_add_capability(dev, PCI_CAP_ID_MSI, offset,
- cap_size, errp);
- if (config_offset < 0) {
- return config_offset;
- }
-
- dev->msi_cap = config_offset;
+ dev->msi_cap = pci_add_capability(dev, PCI_CAP_ID_MSI, offset, cap_size);
dev->cap_present |= QEMU_PCI_CAP_MSI;
pci_set_word(dev->config + msi_flags_off(dev), flags);
--
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 03/16] ahci: 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 05/16] eepro100: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/26
- [PATCH v3 07/16] msi: Omit errp for pci_add_capability,
Akihiko Odaki <=
- [PATCH v3 06/16] hw/nvme: 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 10/16] pci/shpc: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/26
- [PATCH v3 11/16] msix: 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 13/16] hw/pci-bridge/pcie_pci_bridge: 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 09/16] pcie: 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