From f6968c5837e2201172968a49dcd7cd10e1e5a337 Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Fri, 20 Oct 2017 18:29:11 +0200 Subject: [PATCH 06/19] xio3130_downstream: Report error if pcie_chassis_add_slot() failed RH-Author: Eduardo Habkost Message-id: <20171020182917.10771-2-ehabkost@redhat.com> Patchwork-id: 77421 O-Subject: [RHV7.5 qemu-kvm-rhev PATCH v2 1/7] xio3130_downstream: Report error if pcie_chassis_add_slot() failed Bugzilla: 1390348 RH-Acked-by: Marcel Apfelbaum RH-Acked-by: Michael S. Tsirkin RH-Acked-by: Laurent Vivier On commit f8cd1b02 ("pci: Convert to realize"), no error_set*() call was added for the pcie_chassis_add_slot() error case. pcie_chassis_add_slot() errors get ignored, making QEMU crash later. e.g.: $ qemu-system-x86_64 -device ioh3420 -device xio3130-downstream qemu-system-x86_64: memory.c:2166: memory_region_del_subregion: Assertion `subregion->container == mr' failed. Aborted (core dumped) Fix it by reporting the error using error_setg(). Fixes: f8cd1b0201c41d88bb97dcafb80348a0e88d8805 Signed-off-by: Eduardo Habkost Reviewed-by: Marcel Apfelbaum Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin (cherry picked from commit 8b3d26342c4aa171e759e6392fe3b742759d4963) Signed-off-by: Eduardo Habkost Signed-off-by: Miroslav Rezanina --- hw/pci-bridge/xio3130_downstream.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/pci-bridge/xio3130_downstream.c b/hw/pci-bridge/xio3130_downstream.c index e706f36..5a882b0 100644 --- a/hw/pci-bridge/xio3130_downstream.c +++ b/hw/pci-bridge/xio3130_downstream.c @@ -94,6 +94,7 @@ static void xio3130_downstream_realize(PCIDevice *d, Error **errp) pcie_chassis_create(s->chassis); rc = pcie_chassis_add_slot(s); if (rc < 0) { + error_setg(errp, "Can't add chassis slot, error %d", rc); goto err_pcie_cap; } -- 1.8.3.1