mps2: Correctly set parent bus for SCC device
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 24 Jul 2017 16:56:12 +0000 (17:56 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 24 Jul 2017 16:59:28 +0000 (17:59 +0100)
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 <peter.maydell@linaro.org>
Message-id: 1500634509-28011-1-git-send-email-peter.maydell@linaro.org

hw/arm/mps2.c

index f727b4378bd03b043dc397866c206be0acff8f9e..abb0ab6d71ad7e18f9b7cc2c99d20357d593f708 100644 (file)
@@ -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);