diff options
| author | Bernhard Beschow <shentey@gmail.com> | 2023-01-25 14:00:22 +0100 |
|---|---|---|
| committer | Daniel Henrique Barboza <danielhb413@gmail.com> | 2023-02-05 06:40:28 -0300 |
| commit | 0998fcb35360557395b60678e73a9e51334a07dc (patch) | |
| tree | efc8b542630df30b2d2f24e813f53391d56aa6b7 /hw | |
| parent | 891d51be6fb82383f21e20b25b2bd1487c57eef9 (diff) | |
| download | qemu-0998fcb35360557395b60678e73a9e51334a07dc.zip qemu-0998fcb35360557395b60678e73a9e51334a07dc.tar.gz qemu-0998fcb35360557395b60678e73a9e51334a07dc.tar.bz2 | |
hw/ppc/e500{, plat}: Drop redundant checks for presence of platform bus
This is a follow-up on commit 47a0b1dff7e9 'hw/ppc/mpc8544ds: Add
platform bus': Both mpc85xx boards now have a platform bus
unconditionally.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20230125130024.158721-3-shentey@gmail.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/ppc/e500.c | 5 | ||||
| -rw-r--r-- | hw/ppc/e500plat.c | 9 |
2 files changed, 5 insertions, 9 deletions
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 7239993..48288c0 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -643,9 +643,8 @@ static int ppce500_load_device_tree(PPCE500MachineState *pms, } g_free(soc); - if (pms->pbus_dev) { - platform_bus_create_devtree(pms, fdt, mpic); - } + platform_bus_create_devtree(pms, fdt, mpic); + g_free(mpic); pmc->fixup_devtree(fdt); diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c index 44bf874..3032bd3 100644 --- a/hw/ppc/e500plat.c +++ b/hw/ppc/e500plat.c @@ -46,13 +46,10 @@ static void e500plat_machine_device_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { PPCE500MachineState *pms = PPCE500_MACHINE(hotplug_dev); + MachineClass *mc = MACHINE_GET_CLASS(pms); - if (pms->pbus_dev) { - MachineClass *mc = MACHINE_GET_CLASS(pms); - - if (device_is_dynamic_sysbus(mc, dev)) { - platform_bus_link_device(pms->pbus_dev, SYS_BUS_DEVICE(dev)); - } + if (device_is_dynamic_sysbus(mc, dev)) { + platform_bus_link_device(pms->pbus_dev, SYS_BUS_DEVICE(dev)); } } |