[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 05/17] e1000e: Omit errp for pci_add_capability
From: |
Akihiko Odaki |
Subject: |
[PATCH v5 05/17] e1000e: Omit errp for pci_add_capability |
Date: |
Fri, 28 Oct 2022 21:26:17 +0900 |
Omitting errp for pci_add_capability() causes it to abort if
capabilities overlap. This behavior is appropriate here because all of
the capabilities set in this device are defined in the program and
their overlap should not happen unless there is a programming error.
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
---
hw/net/e1000e.c | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)
diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c
index ac96f7665a..e433b8f9a5 100644
--- a/hw/net/e1000e.c
+++ b/hw/net/e1000e.c
@@ -377,17 +377,10 @@ e1000e_gen_dsn(uint8_t *mac)
(uint64_t)(mac[0]) << 56;
}
-static int
+static void
e1000e_add_pm_capability(PCIDevice *pdev, uint8_t offset, uint16_t pmc)
{
- Error *local_err = NULL;
- int ret = pci_add_capability(pdev, PCI_CAP_ID_PM, offset,
- PCI_PM_SIZEOF, &local_err);
-
- if (local_err) {
- error_report_err(local_err);
- return ret;
- }
+ pci_add_capability(pdev, PCI_CAP_ID_PM, offset, PCI_PM_SIZEOF);
pci_set_word(pdev->config + offset + PCI_PM_PMC,
PCI_PM_CAP_VER_1_1 |
@@ -400,8 +393,6 @@ e1000e_add_pm_capability(PCIDevice *pdev, uint8_t offset,
uint16_t pmc)
pci_set_word(pdev->w1cmask + offset + PCI_PM_CTRL,
PCI_PM_CTRL_PME_STATUS);
-
- return ret;
}
static void e1000e_write_config(PCIDevice *pci_dev, uint32_t address,
@@ -480,10 +471,7 @@ static void e1000e_pci_realize(PCIDevice *pci_dev, Error
**errp)
trace_e1000e_msi_init_fail(ret);
}
- if (e1000e_add_pm_capability(pci_dev, e1000e_pmrb_offset,
- PCI_PM_CAP_DSI) < 0) {
- hw_error("Failed to initialize PM capability");
- }
+ e1000e_add_pm_capability(pci_dev, e1000e_pmrb_offset, PCI_PM_CAP_DSI);
if (pcie_aer_init(pci_dev, PCI_ERR_VER, e1000e_aer_offset,
PCI_ERR_SIZEOF, NULL) < 0) {
--
2.37.3
- Re: [PATCH v5 01/17] hw/vfio/pci: Ensure MSI and MSI-X do not overlap, (continued)
[PATCH v5 03/17] hw/i386/amd_iommu: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/28
[PATCH v5 02/17] pci: Allow to omit errp for pci_add_capability, Akihiko Odaki, 2022/10/28
[PATCH v5 07/17] hw/nvme: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/28
[PATCH v5 04/17] ahci: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/28
[PATCH v5 10/17] pcie: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/28
[PATCH v5 11/17] pci/shpc: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/28
[PATCH v5 05/17] e1000e: Omit errp for pci_add_capability,
Akihiko Odaki <=
[PATCH v5 08/17] msi: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/28
[PATCH v5 09/17] hw/pci/pci_bridge: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/28
[PATCH v5 06/17] eepro100: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/28
[PATCH v5 12/17] msix: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/28
[PATCH v5 13/17] pci/slotid: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/28
[PATCH v5 14/17] hw/pci-bridge/pcie_pci_bridge: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/28
[PATCH v5 15/17] hw/vfio/pci: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/28
[PATCH v5 17/17] pci: Remove legacy errp from pci_add_capability, Akihiko Odaki, 2022/10/28
[PATCH v5 16/17] virtio-pci: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/28