From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 3/4] mps2: Correctly set parent bus for SCC device
Date: Mon, 24 Jul 2017 18:06:17 +0100 [thread overview]
Message-ID: <1500915978-29213-4-git-send-email-peter.maydell@linaro.org> (raw)
In-Reply-To: <1500915978-29213-1-git-send-email-peter.maydell@linaro.org>
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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c
index f727b43..abb0ab6 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);
--
2.7.4
next prev parent reply other threads:[~2017-07-24 17:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-24 17:06 [Qemu-devel] [PULL 0/4] target-arm queue Peter Maydell
2017-07-24 17:06 ` [Qemu-devel] [PULL 1/4] target/arm: fix TCG temp leak in aarch64 rev16 Peter Maydell
2017-07-24 17:06 ` [Qemu-devel] [PULL 2/4] fsl_imx*: Migrate ROM contents Peter Maydell
2017-07-24 17:06 ` Peter Maydell [this message]
2017-07-24 17:06 ` [Qemu-devel] [PULL 4/4] integratorcp: Don't migrate flash using vmstate_register_ram_global() Peter Maydell
2017-07-24 18:21 ` [Qemu-devel] [PULL 0/4] target-arm queue Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1500915978-29213-4-git-send-email-peter.maydell@linaro.org \
--to=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).