From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Marcel Apfelbaum <marcel@redhat.com>
Subject: [Qemu-devel] [PULL v4 13/29] hw/pci-bridge: fix QEMU crash because of pcie-root-port
Date: Thu, 18 Jan 2018 22:45:28 +0200 [thread overview]
Message-ID: <1516308132-10272-14-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1516308132-10272-1-git-send-email-mst@redhat.com>
From: Marcel Apfelbaum <marcel@redhat.com>
If we try to use more pcie_root_ports then available slots
and an IO hint is passed to the port, QEMU crashes because
we try to init the "IO hint" capability even if the device
is not created.
Fix it by checking for error before adding the capability,
so QEMU can fail gracefully.
Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/pci-bridge/gen_pcie_root_port.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/hw/pci-bridge/gen_pcie_root_port.c b/hw/pci-bridge/gen_pcie_root_port.c
index ad4e6aa..0e2f2e8 100644
--- a/hw/pci-bridge/gen_pcie_root_port.c
+++ b/hw/pci-bridge/gen_pcie_root_port.c
@@ -74,8 +74,13 @@ static void gen_rp_realize(DeviceState *dev, Error **errp)
PCIDevice *d = PCI_DEVICE(dev);
GenPCIERootPort *grp = GEN_PCIE_ROOT_PORT(d);
PCIERootPortClass *rpc = PCIE_ROOT_PORT_GET_CLASS(d);
+ Error *local_err = NULL;
- rpc->parent_realize(dev, errp);
+ rpc->parent_realize(dev, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ return;
+ }
int rc = pci_bridge_qemu_reserve_cap_init(d, 0, grp->bus_reserve,
grp->io_reserve, grp->mem_reserve, grp->pref32_reserve,
--
MST
next prev parent reply other threads:[~2018-01-18 20:45 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-18 20:44 [Qemu-devel] [PULL v4 00/29] pc, pci, virtio: features, fixes, cleanups Michael S. Tsirkin
2018-01-18 20:44 ` [Qemu-devel] [PULL v4 01/29] MAINTAINERS: Add myself as maintainer to X86 machines Michael S. Tsirkin
2018-01-18 20:44 ` [Qemu-devel] [PULL v4 02/29] vhost-user: add new vhost user messages to support virtio config space Michael S. Tsirkin
2018-03-28 10:03 ` Maxime Coquelin
2018-03-28 14:24 ` Michael S. Tsirkin
2018-01-18 20:44 ` [Qemu-devel] [PULL v4 03/29] vhost-user-blk: introduce a new vhost-user-blk host device Michael S. Tsirkin
2018-01-18 20:44 ` [Qemu-devel] [PULL v4 04/29] contrib/libvhost-user: enable virtio config space messages Michael S. Tsirkin
2018-01-18 20:44 ` [Qemu-devel] [PULL v4 05/29] contrib/vhost-user-blk: introduce a vhost-user-blk sample application Michael S. Tsirkin
2018-01-18 20:44 ` [Qemu-devel] [PULL v4 06/29] qemu: add a cleanup callback function to EventNotifier Michael S. Tsirkin
2018-01-18 20:44 ` [Qemu-devel] [PULL v4 07/29] virtio: postpone the execution of event_notifier_cleanup function Michael S. Tsirkin
2018-01-18 20:44 ` [Qemu-devel] [PULL v4 08/29] virtio: improve virtio devices initialization time Michael S. Tsirkin
2018-01-18 20:44 ` [Qemu-devel] [PULL v4 09/29] pci/shpc: Move function to generic header file Michael S. Tsirkin
2018-01-18 21:51 ` Eric Blake
2018-01-22 7:30 ` Yuval Shaia
2018-01-18 20:44 ` [Qemu-devel] [PULL v4 10/29] vhost-user: fix multiple queue specification Michael S. Tsirkin
2018-01-18 20:45 ` [Qemu-devel] [PULL v4 11/29] intel-iommu: Redefine macros to enable supporting 48 bit address width Michael S. Tsirkin
2018-01-18 20:45 ` [Qemu-devel] [PULL v4 12/29] intel-iommu: Extend address width to 48 bits Michael S. Tsirkin
2018-01-19 3:34 ` Jason Wang
2018-01-19 3:39 ` Michael S. Tsirkin
2018-01-18 20:45 ` Michael S. Tsirkin [this message]
2018-01-18 20:45 ` [Qemu-devel] [PULL v4 14/29] ACPI/unit-test: Add a testcase for RAM allocation in numa node Michael S. Tsirkin
2018-01-18 20:45 ` [Qemu-devel] [PULL v4 15/29] hw/acpi-build: Make next_base easy to follow Michael S. Tsirkin
2018-01-18 20:45 ` [Qemu-devel] [PULL v4 16/29] vhost-user-test: fix features mask Michael S. Tsirkin
2018-01-18 20:45 ` [Qemu-devel] [PULL v4 17/29] vhost-user-test: extract read-guest-mem test from main loop Michael S. Tsirkin
2018-01-18 20:45 ` [Qemu-devel] [PULL v4 18/29] vhost-user-test: setup virtqueues in all tests Michael S. Tsirkin
2018-01-18 20:46 ` [Qemu-devel] [PULL v4 19/29] vhost-user-test: make features mask an init_virtio_dev() argument Michael S. Tsirkin
2018-01-18 20:46 ` [Qemu-devel] [PULL v4 20/29] vhost-user-test: use init_virtio_dev in multiqueue test Michael S. Tsirkin
2018-01-18 20:46 ` [Qemu-devel] [PULL v4 21/29] x86_iommu: Move machine check to x86_iommu_realize() Michael S. Tsirkin
2018-01-18 20:46 ` [Qemu-devel] [PULL v4 22/29] x86_iommu: check if machine has PCI bus Michael S. Tsirkin
2018-01-18 20:46 ` [Qemu-devel] [PULL v4 23/29] tests: acpi: move tested tables array allocation outside of test_acpi_dsdt_table() Michael S. Tsirkin
2018-01-18 20:46 ` [Qemu-devel] [PULL v4 24/29] tests: acpi: init table descriptor in test_dst_table() Michael S. Tsirkin
2018-01-18 20:46 ` [Qemu-devel] [PULL v4 25/29] tests: acpi: rename test_acpi_tables()/test_dst_table() to reflect its usage Michael S. Tsirkin
2018-01-18 20:46 ` [Qemu-devel] [PULL v4 26/29] tests: acpi: add comments to fetch_rsdt_referenced_tables/data->tables usage Michael S. Tsirkin
2018-01-18 20:46 ` [Qemu-devel] [PULL v4 27/29] vhost-user: factor out msg head and payload Michael S. Tsirkin
2018-01-18 20:46 ` [Qemu-devel] [PULL v4 28/29] vhost-user: fix misaligned access to payload Michael S. Tsirkin
2018-01-18 20:46 ` [Qemu-devel] [PULL v4 29/29] vhost: remove assertion to prevent crash Michael S. Tsirkin
2018-01-19 12:38 ` [Qemu-devel] [PULL v4 00/29] pc, pci, virtio: features, fixes, cleanups Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1516308132-10272-14-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=marcel@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).