diff options
| author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2023-11-20 12:51:15 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2023-11-20 15:34:19 +0000 |
| commit | 0cbb56c236a4a28f5149eed227d74bb737321cfc (patch) | |
| tree | ad642975c37e9e218e702e1d72d80553ad07bc64 /hw/arm/fsl-imx25.c | |
| parent | d652866007fc6fae718b0bcfdaf757231b378dd7 (diff) | |
| download | qemu-0cbb56c236a4a28f5149eed227d74bb737321cfc.zip qemu-0cbb56c236a4a28f5149eed227d74bb737321cfc.tar.gz qemu-0cbb56c236a4a28f5149eed227d74bb737321cfc.tar.bz2 | |
hw/arm/fsl-imx: Do not ignore Error argument
Both i.MX25 and i.MX6 SoC models ignore the Error argument when
setting the PHY number. Pick &error_abort which is the error
used by the i.MX7 SoC (see commit 1f7197deb0 "ability to change
the FEC PHY on i.MX7 processor").
Fixes: 74c1330582 ("ability to change the FEC PHY on i.MX25 processor")
Fixes: a9c167a3c4 ("ability to change the FEC PHY on i.MX6 processor")
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-id: 20231120115116.76858-1-philmd@linaro.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/fsl-imx25.c')
| -rw-r--r-- | hw/arm/fsl-imx25.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c index 24c4374..9aabbf7 100644 --- a/hw/arm/fsl-imx25.c +++ b/hw/arm/fsl-imx25.c @@ -169,7 +169,8 @@ static void fsl_imx25_realize(DeviceState *dev, Error **errp) epit_table[i].irq)); } - object_property_set_uint(OBJECT(&s->fec), "phy-num", s->phy_num, &err); + object_property_set_uint(OBJECT(&s->fec), "phy-num", s->phy_num, + &error_abort); qdev_set_nic_properties(DEVICE(&s->fec), &nd_table[0]); if (!sysbus_realize(SYS_BUS_DEVICE(&s->fec), errp)) { |