Currently QEMU terminates if you try to hotplug pnv-phb-root-port in
an environment where it is not supported, e.g. if doing this:
echo "device_add pnv-phb-root-port" | \
./qemu-system-ppc64 -monitor stdio -M powernv9
To avoid this problem, the pnv_phb_root_port_realize() function should
not use error_fatal when trying to set the properties which might not
be available.
Signed-off-by: Thomas Huth <th...@redhat.com>
---
hw/pci-host/pnv_phb.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/hw/pci-host/pnv_phb.c b/hw/pci-host/pnv_phb.c
index 7b11f1e8dd..0b26b43736 100644
--- a/hw/pci-host/pnv_phb.c
+++ b/hw/pci-host/pnv_phb.c
@@ -241,8 +241,16 @@ static void pnv_phb_root_port_realize(DeviceState *dev,
Error **errp)
* QOM id. 'chip_id' is going to be used as PCIE chassis for the
* root port.
*/
- chip_id = object_property_get_int(OBJECT(bus), "chip-id", &error_fatal);
- index = object_property_get_int(OBJECT(bus), "phb-id", &error_fatal);
+ chip_id = object_property_get_int(OBJECT(bus), "chip-id", &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ return;
+ }
+ index = object_property_get_int(OBJECT(bus), "phb-id", &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ return;
+ }
/* Set unique chassis/slot values for the root port */
qdev_prop_set_uint8(dev, "chassis", chip_id);
--
2.31.1
