diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-24 17:56:12 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-24 17:59:28 +0100 |
| commit | 3d75007e017b62f2165b8c0166f0e4984bc1640d (patch) | |
| tree | 05be8c53660211d9aed79038026236dfb3e5316b /hw/arm | |
| parent | eda40cc1686162dcd92a97debcbb0df74269651f (diff) | |
| download | qemu-3d75007e017b62f2165b8c0166f0e4984bc1640d.zip | |
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 <peter.maydell@linaro.org>
Message-id: 1500634509-28011-1-git-send-email-peter.maydell@linaro.org
Diffstat (limited to 'hw/arm')
| -rw-r--r-- | hw/arm/mps2.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |