[Xen-changelog] [qemu-xen master] hw/pci-bridge: fix QEMU crash because of pcie-root-port

[patchbot@xxxxxxx]

commit 1027f3419b20329776696df343dbc8dc320d6b1b
Author:     Marcel Apfelbaum <marcel@xxxxxxxxxx>
AuthorDate: Wed Jan 10 21:09:09 2018 +0200
Commit:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
CommitDate: Tue Jan 23 16:45:21 2018 -0600

    hw/pci-bridge: fix QEMU crash because of pcie-root-port
    
    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@xxxxxxxxxx>
    Reviewed-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
    Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
    (cherry picked from commit fced4d00e68e7559c73746d963265f7fd0b6abf9)
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
---
 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,
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog