* [PATCH] hw/pci-host/pnv_phb: Avoid quitting QEMU if hotplug of pnv-phb-root-port fails
@ 2022-11-09 12:22 Thomas Huth
2022-11-09 13:24 ` Cédric Le Goater
2022-11-09 13:35 ` Daniel Henrique Barboza
0 siblings, 2 replies; 3+ messages in thread
From: Thomas Huth @ 2022-11-09 12:22 UTC (permalink / raw)
To: Cédric Le Goater, qemu-ppc; +Cc: qemu-devel, Daniel Henrique Barboza
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 <thuth@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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] hw/pci-host/pnv_phb: Avoid quitting QEMU if hotplug of pnv-phb-root-port fails
2022-11-09 12:22 [PATCH] hw/pci-host/pnv_phb: Avoid quitting QEMU if hotplug of pnv-phb-root-port fails Thomas Huth
@ 2022-11-09 13:24 ` Cédric Le Goater
2022-11-09 13:35 ` Daniel Henrique Barboza
1 sibling, 0 replies; 3+ messages in thread
From: Cédric Le Goater @ 2022-11-09 13:24 UTC (permalink / raw)
To: Thomas Huth, qemu-ppc; +Cc: qemu-devel, Daniel Henrique Barboza
On 11/9/22 13:22, Thomas Huth wrote:
> 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.
Fixes: c2f3f78af5 ("ppc/pnv: set root port chassis and slot using Bus properties")
Reviewed-by: Cédric Le Goater <clg@kaod.org>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Thanks,
C.
> ---
> 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);
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] hw/pci-host/pnv_phb: Avoid quitting QEMU if hotplug of pnv-phb-root-port fails
2022-11-09 12:22 [PATCH] hw/pci-host/pnv_phb: Avoid quitting QEMU if hotplug of pnv-phb-root-port fails Thomas Huth
2022-11-09 13:24 ` Cédric Le Goater
@ 2022-11-09 13:35 ` Daniel Henrique Barboza
1 sibling, 0 replies; 3+ messages in thread
From: Daniel Henrique Barboza @ 2022-11-09 13:35 UTC (permalink / raw)
To: Thomas Huth, Cédric Le Goater, qemu-ppc; +Cc: qemu-devel
On 11/9/22 09:22, Thomas Huth wrote:
> 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 <thuth@redhat.com>
> ---
Ops, my bad. Thanks for fixing it up.
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
And queued in gitlab.com/danielhb/qemu/tree/ppc-next after adding the
"Fixes" tag Cedric mentioned. Thanks,
Daniel
> 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);
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-11-09 13:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-09 12:22 [PATCH] hw/pci-host/pnv_phb: Avoid quitting QEMU if hotplug of pnv-phb-root-port fails Thomas Huth
2022-11-09 13:24 ` Cédric Le Goater
2022-11-09 13:35 ` Daniel Henrique Barboza
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.