[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/47] pcie_aer: Convert pcie_aer_init to Error
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 10/47] pcie_aer: Convert pcie_aer_init to Error |
Date: |
Thu, 10 Nov 2016 18:12:55 +0200 |
From: Cao jin <address@hidden>
When user specify invalid property aer_log_max, device should fail to
create, and report appropriate message.
Signed-off-by: Cao jin <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Acked-by: Dmitry Fleytman <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/hw/pci/pcie_aer.h | 3 ++-
hw/net/e1000e.c | 2 +-
hw/pci-bridge/ioh3420.c | 3 ++-
hw/pci-bridge/xio3130_downstream.c | 3 ++-
hw/pci-bridge/xio3130_upstream.c | 3 ++-
hw/pci/pcie_aer.c | 17 +++++++----------
6 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/include/hw/pci/pcie_aer.h b/include/hw/pci/pcie_aer.h
index c2ee4e2..1cce61a 100644
--- a/include/hw/pci/pcie_aer.h
+++ b/include/hw/pci/pcie_aer.h
@@ -87,7 +87,8 @@ struct PCIEAERErr {
extern const VMStateDescription vmstate_pcie_aer_log;
-int pcie_aer_init(PCIDevice *dev, uint16_t offset, uint16_t size);
+int pcie_aer_init(PCIDevice *dev, uint16_t offset, uint16_t size,
+ Error **errp);
void pcie_aer_exit(PCIDevice *dev);
void pcie_aer_write_config(PCIDevice *dev,
uint32_t addr, uint32_t val, int len);
diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c
index 4994e1c..89f96eb 100644
--- a/hw/net/e1000e.c
+++ b/hw/net/e1000e.c
@@ -472,7 +472,7 @@ static void e1000e_pci_realize(PCIDevice *pci_dev, Error
**errp)
hw_error("Failed to initialize PM capability");
}
- if (pcie_aer_init(pci_dev, e1000e_aer_offset, PCI_ERR_SIZEOF) < 0) {
+ if (pcie_aer_init(pci_dev, e1000e_aer_offset, PCI_ERR_SIZEOF, NULL) < 0) {
hw_error("Failed to initialize AER capability");
}
diff --git a/hw/pci-bridge/ioh3420.c b/hw/pci-bridge/ioh3420.c
index c8b5ac4..04180af 100644
--- a/hw/pci-bridge/ioh3420.c
+++ b/hw/pci-bridge/ioh3420.c
@@ -135,8 +135,9 @@ static int ioh3420_initfn(PCIDevice *d)
goto err_pcie_cap;
}
- rc = pcie_aer_init(d, IOH_EP_AER_OFFSET, PCI_ERR_SIZEOF);
+ rc = pcie_aer_init(d, IOH_EP_AER_OFFSET, PCI_ERR_SIZEOF, &err);
if (rc < 0) {
+ error_report_err(err);
goto err;
}
pcie_aer_root_init(d);
diff --git a/hw/pci-bridge/xio3130_downstream.c
b/hw/pci-bridge/xio3130_downstream.c
index cef6e13..5713341 100644
--- a/hw/pci-bridge/xio3130_downstream.c
+++ b/hw/pci-bridge/xio3130_downstream.c
@@ -97,8 +97,9 @@ static int xio3130_downstream_initfn(PCIDevice *d)
goto err_pcie_cap;
}
- rc = pcie_aer_init(d, XIO3130_AER_OFFSET, PCI_ERR_SIZEOF);
+ rc = pcie_aer_init(d, XIO3130_AER_OFFSET, PCI_ERR_SIZEOF, &err);
if (rc < 0) {
+ error_report_err(err);
goto err;
}
diff --git a/hw/pci-bridge/xio3130_upstream.c b/hw/pci-bridge/xio3130_upstream.c
index 4ad0440..94c1691 100644
--- a/hw/pci-bridge/xio3130_upstream.c
+++ b/hw/pci-bridge/xio3130_upstream.c
@@ -85,8 +85,9 @@ static int xio3130_upstream_initfn(PCIDevice *d)
pcie_cap_flr_init(d);
pcie_cap_deverr_init(d);
- rc = pcie_aer_init(d, XIO3130_AER_OFFSET, PCI_ERR_SIZEOF);
+ rc = pcie_aer_init(d, XIO3130_AER_OFFSET, PCI_ERR_SIZEOF, &err);
if (rc < 0) {
+ error_report_err(err);
goto err;
}
diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c
index 048ce6a..2a4bd5a 100644
--- a/hw/pci/pcie_aer.c
+++ b/hw/pci/pcie_aer.c
@@ -29,6 +29,7 @@
#include "hw/pci/msi.h"
#include "hw/pci/pci_bus.h"
#include "hw/pci/pcie_regs.h"
+#include "qapi/error.h"
//#define DEBUG_PCIE
#ifdef DEBUG_PCIE
@@ -96,21 +97,17 @@ static void aer_log_clear_all_err(PCIEAERLog *aer_log)
aer_log->log_num = 0;
}
-int pcie_aer_init(PCIDevice *dev, uint16_t offset, uint16_t size)
+int pcie_aer_init(PCIDevice *dev, uint16_t offset, uint16_t size,
+ Error **errp)
{
- PCIExpressDevice *exp;
-
pcie_add_capability(dev, PCI_EXT_CAP_ID_ERR, PCI_ERR_VER,
offset, size);
- exp = &dev->exp;
- exp->aer_cap = offset;
+ dev->exp.aer_cap = offset;
- /* log_max is property */
- if (dev->exp.aer_log.log_max == PCIE_AER_LOG_MAX_UNSET) {
- dev->exp.aer_log.log_max = PCIE_AER_LOG_MAX_DEFAULT;
- }
- /* clip down the value to avoid unreasobale memory usage */
+ /* clip down the value to avoid unreasonable memory usage */
if (dev->exp.aer_log.log_max > PCIE_AER_LOG_MAX_LIMIT) {
+ error_setg(errp, "Invalid aer_log_max %d. The max number of aer log "
+ "is %d", dev->exp.aer_log.log_max, PCIE_AER_LOG_MAX_LIMIT);
return -EINVAL;
}
dev->exp.aer_log.log = g_malloc0(sizeof dev->exp.aer_log.log[0] *
--
MST
- [Qemu-devel] [PULL 00/47] virtio, vhost, pc, pci: tests, documentation, fixes and cleanups, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 05/47] contrib: add libvhost-user, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 01/47] tests/vhost-user-bridge: remove false comment, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 02/47] tests/vhost-user-bridge: remove unnecessary dispatcher_remove, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 04/47] tests/vhost-user-bridge: do not accept more than one connection, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 03/47] tests/vhost-user-bridge: indicate peer disconnected, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 06/47] tests/vhost-user-bridge: use contrib/libvhost-user, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 07/47] intel_iommu: fixing source id during IOTLB hash key calculation, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 09/47] virtio: make virtqueue_alloc_element static, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 08/47] virtio: rename virtqueue_discard to virtqueue_unpop, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 10/47] pcie_aer: Convert pcie_aer_init to Error,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 12/47] intel_iommu: fix several incorrect endianess and bit fields, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 11/47] virtio-crypto: tag as not hotpluggable and migration, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 13/47] intel_iommu: fix incorrect assert, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 14/47] acpi: fix DMAR device scope for IOAPIC, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 15/47] virtio: allow per-device-class legacy features, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 16/47] virtio-net: mark VIRTIO_NET_F_GSO as legacy, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 17/47] vhost: Update 'ioeventfd_started' with host notifiers, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 18/47] vhost: Use vbus var instead of VIRTIO_BUS() macro, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 19/47] vhost: migration blocker only if shared log is used, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 20/47] qdev: hotplug: drop HotplugHandler.post_plug callback, Michael S. Tsirkin, 2016/11/10