Now that the MPC8544DS board also has a platform bus, the if statement
is always true.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/ppc/e500.c | 30 ++++++++++++++----------------
hw/ppc/e500.h | 1 -
hw/ppc/e500plat.c | 1 -
hw/ppc/mpc8544ds.c | 1 -
4 files changed, 14 insertions(+), 19 deletions(-)
/* Platform Bus Device */
- if (pmc->has_platform_bus) {
- dev = qdev_new(TYPE_PLATFORM_BUS_DEVICE);
- dev->id = g_strdup(TYPE_PLATFORM_BUS_DEVICE);
- qdev_prop_set_uint32(dev, "num_irqs", pmc->platform_bus_num_irqs);
- qdev_prop_set_uint32(dev, "mmio_size", pmc->platform_bus_size);
- sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
- pms->pbus_dev = PLATFORM_BUS_DEVICE(dev);
-
- s = SYS_BUS_DEVICE(pms->pbus_dev);
- for (i = 0; i < pmc->platform_bus_num_irqs; i++) {
- int irqn = pmc->platform_bus_first_irq + i;
- sysbus_connect_irq(s, i, qdev_get_gpio_in(mpicdev, irqn));
- }
+ dev = qdev_new(TYPE_PLATFORM_BUS_DEVICE);
+ dev->id = g_strdup(TYPE_PLATFORM_BUS_DEVICE);
+ qdev_prop_set_uint32(dev, "num_irqs", pmc->platform_bus_num_irqs);
+ qdev_prop_set_uint32(dev, "mmio_size", pmc->platform_bus_size);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
+ pms->pbus_dev = PLATFORM_BUS_DEVICE(dev);
- memory_region_add_subregion(address_space_mem,
- pmc->platform_bus_base,
- &pms->pbus_dev->mmio);
+ s = SYS_BUS_DEVICE(pms->pbus_dev);
+ for (i = 0; i < pmc->platform_bus_num_irqs; i++) {
+ int irqn = pmc->platform_bus_first_irq + i;
+ sysbus_connect_irq(s, i, qdev_get_gpio_in(mpicdev, irqn));
}
+ memory_region_add_subregion(address_space_mem,
+ pmc->platform_bus_base,
+ &pms->pbus_dev->mmio);