From 3d75007e017b62f2165b8c0166f0e4984bc1640d Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Mon, 24 Jul 2017 17:56:12 +0100 Subject: mps2: Correctly set parent bus for SCC device A cut-and-paste error meant that instead of setting the qdev parent bus for the SCC device we were setting it twice for the ARMv7M container device. Fix this bug. Signed-off-by: Peter Maydell Message-id: 1500634509-28011-1-git-send-email-peter.maydell@linaro.org --- hw/arm/mps2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw') diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c index f727b4378b..abb0ab6d71 100644 --- a/hw/arm/mps2.c +++ b/hw/arm/mps2.c @@ -303,7 +303,7 @@ static void mps2_common_init(MachineState *machine) object_initialize(&mms->scc, sizeof(mms->scc), TYPE_MPS2_SCC); sccdev = DEVICE(&mms->scc); - qdev_set_parent_bus(armv7m, sysbus_get_default()); + qdev_set_parent_bus(sccdev, sysbus_get_default()); qdev_prop_set_uint32(sccdev, "scc-cfg4", 0x2); qdev_prop_set_uint32(sccdev, "scc-aid", 0x02000008); qdev_prop_set_uint32(sccdev, "scc-id", mmc->scc_id); -- cgit v1.2.3