From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: pbonzini@redhat.com, qemu-arm@nongnu.org, berrange@redhat.com,
ehabkost@redhat.com, Peter Maydell <peter.maydell@linaro.org>
Subject: [PATCH 06/24] armv7m: Bury unwanted "ARM,bitband-memory" devices
Date: Mon, 18 May 2020 07:03:50 +0200 [thread overview]
Message-ID: <20200518050408.4579-7-armbru@redhat.com> (raw)
In-Reply-To: <20200518050408.4579-1-armbru@redhat.com>
These devices are optional, and enabled by property "enable-bitband".
armv7m_instance_init() creates them unconditionally, because the
property has not been set then. armv7m_realize() realizes them only
when the property is true. Works, although it leaves unrealized
devices hanging around in the QOM composition tree. Affects machines
microbit, mps2-an505, mps2-an521, musca-a, and musca-b1.
Bury the unwanted devices by making armv7m_realize() unparent them.
Visible in "info qom-tree"; here's the change for microbit:
/machine (microbit-machine)
/microbit.twi (microbit.i2c)
/microbit.twi[0] (qemu:memory-region)
/nrf51 (nrf51-soc)
/armv6m (armv7m)
/armv7m-container[0] (qemu:memory-region)
- /bitband[0] (ARM,bitband-memory)
- /bitband[0] (qemu:memory-region)
- /bitband[1] (ARM,bitband-memory)
- /bitband[0] (qemu:memory-region)
/cpu (cortex-m0-arm-cpu)
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hw/arm/armv7m.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index 7da57f56d3..f930619f53 100644
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -245,8 +245,8 @@ static void armv7m_realize(DeviceState *dev, Error **errp)
memory_region_add_subregion(&s->container, 0xe000e000,
sysbus_mmio_get_region(sbd, 0));
- if (s->enable_bitband) {
- for (i = 0; i < ARRAY_SIZE(s->bitband); i++) {
+ for (i = 0; i < ARRAY_SIZE(s->bitband); i++) {
+ if (s->enable_bitband) {
Object *obj = OBJECT(&s->bitband[i]);
SysBusDevice *sbd = SYS_BUS_DEVICE(&s->bitband[i]);
@@ -265,6 +265,8 @@ static void armv7m_realize(DeviceState *dev, Error **errp)
memory_region_add_subregion(&s->container, bitband_output_addr[i],
sysbus_mmio_get_region(sbd, 0));
+ } else {
+ object_unparent(OBJECT(&s->bitband[i]));
}
}
}
--
2.21.1
next prev parent reply other threads:[~2020-05-18 5:11 UTC|newest]
Thread overview: 99+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-18 5:03 [PATCH 00/24] Fixes around device realization Markus Armbruster
2020-05-18 5:03 ` [PATCH 01/24] arm/stm32f405: Fix realization of "stm32f2xx-adc" devices Markus Armbruster
2020-05-18 16:48 ` Alistair Francis
2020-05-19 5:08 ` Markus Armbruster
2020-05-19 22:20 ` Alistair Francis
2020-05-27 9:27 ` Markus Armbruster
2020-05-27 11:24 ` Philippe Mathieu-Daudé
2020-05-18 5:03 ` [PATCH 02/24] display/xlnx_dp: Fix to realize "i2c-ddc" and "aux-to-i2c-bridge" Markus Armbruster
2020-05-18 8:19 ` Fred Konrad
2020-05-19 5:09 ` Markus Armbruster
2020-05-19 9:48 ` Peter Maydell
2020-05-19 12:07 ` Markus Armbruster
2020-05-18 9:59 ` Edgar E. Iglesias
2020-05-18 10:30 ` Peter Maydell
2020-05-18 11:13 ` Philippe Mathieu-Daudé
2020-05-19 5:13 ` Markus Armbruster
2020-05-18 16:56 ` Alistair Francis
2020-05-18 5:03 ` [PATCH 03/24] sd/pxa2xx_mmci: Fix to realize "pxa2xx-mmci" device Markus Armbruster
2020-05-21 16:20 ` Peter Maydell
2020-05-18 5:03 ` [PATCH 04/24] aspeed: Don't create unwanted "ftgmac100", "aspeed-mmi" devices Markus Armbruster
2020-05-18 12:19 ` Cédric Le Goater
2020-05-19 0:20 ` Andrew Jeffery
2020-05-19 5:45 ` Markus Armbruster
2020-05-19 11:42 ` Philippe Mathieu-Daudé
2020-05-19 12:44 ` Cédric Le Goater
2020-05-19 0:38 ` Joel Stanley
2020-05-19 5:35 ` Markus Armbruster
2020-05-18 5:03 ` [PATCH 05/24] aspeed: Don't create unwanted "cortex-a7-arm-cpu" devices Markus Armbruster
2020-05-18 12:24 ` Cédric Le Goater
2020-05-19 0:40 ` Joel Stanley
2020-05-19 5:46 ` Markus Armbruster
2020-05-19 9:35 ` Cédric Le Goater
2020-05-18 5:03 ` Markus Armbruster [this message]
2020-05-21 16:17 ` [PATCH 06/24] armv7m: Bury unwanted "ARM,bitband-memory" devices Peter Maydell
2020-05-25 5:50 ` Markus Armbruster
2020-05-25 12:32 ` Paolo Bonzini
2020-05-25 12:49 ` Peter Maydell
2020-05-26 5:19 ` Markus Armbruster
2020-05-18 5:03 ` [PATCH 07/24] auxbus: Fix aux-to-i2c-bridge to be a subtype of aux-slave Markus Armbruster
2020-05-18 8:53 ` Philippe Mathieu-Daudé
2020-05-18 5:03 ` [PATCH 08/24] mac_via: Fix to realize "mos6522-q800-via*" devices Markus Armbruster
2020-05-18 20:25 ` Mark Cave-Ayland
2020-05-18 5:03 ` [PATCH 09/24] macio: Fix to realize "mos6522-cuda" and "mos6522-pmu" devices Markus Armbruster
2020-05-21 16:26 ` Peter Maydell
2020-05-25 6:25 ` Markus Armbruster
2020-05-27 14:12 ` Markus Armbruster
2020-05-27 15:05 ` Peter Maydell
2020-05-27 15:12 ` Paolo Bonzini
2020-05-28 6:57 ` Markus Armbruster
2020-05-27 16:08 ` Markus Armbruster
2020-05-18 5:03 ` [PATCH 10/24] macio: Bury unwanted "macio-gpio" devices Markus Armbruster
2020-05-18 20:35 ` Mark Cave-Ayland
2020-05-19 6:06 ` Markus Armbruster
2020-05-18 5:03 ` [PATCH 11/24] pnv/phb4: Bury unwanted "pnv-phb4-pec-stack" devices Markus Armbruster
2020-05-18 8:49 ` Greg Kurz
2020-05-18 13:24 ` Cédric Le Goater
2020-05-19 8:16 ` Cédric Le Goater
2020-05-19 11:50 ` Markus Armbruster
2020-05-18 5:03 ` [PATCH 12/24] MAINTAINERS: Make section PowerNV cover pci-host/pnv* as well Markus Armbruster
2020-05-18 6:41 ` David Gibson
2020-05-18 5:03 ` [PATCH 13/24] ppc4xx: Drop redundant device realization Markus Armbruster
2020-05-18 8:54 ` Philippe Mathieu-Daudé
2020-05-18 10:27 ` BALATON Zoltan
2020-05-19 6:07 ` Markus Armbruster
2020-05-18 16:41 ` Thomas Huth
2020-05-18 5:03 ` [PATCH 14/24] macio: Put "macio-nvram" device on the macio bus Markus Armbruster
2020-05-18 20:37 ` Mark Cave-Ayland
2020-05-18 5:03 ` [PATCH 15/24] macio: Fix macio-bus to be a subtype of System bus Markus Armbruster
2020-05-18 8:55 ` Philippe Mathieu-Daudé
2020-05-18 20:39 ` Mark Cave-Ayland
2020-05-19 6:09 ` Markus Armbruster
2020-05-18 5:04 ` [PATCH 16/24] ppc/pnv: Put "*-pnv-chip" and "pnv-xive" on the main system bus Markus Armbruster
2020-05-18 16:34 ` Cédric Le Goater
2020-05-19 6:28 ` Markus Armbruster
2020-05-19 13:05 ` Cédric Le Goater
2020-05-18 5:04 ` [PATCH 17/24] pnv/psi: Correct the pnv-psi* devices not to be sysbus devices Markus Armbruster
2020-05-18 16:27 ` Cédric Le Goater
2020-05-19 6:30 ` Markus Armbruster
2020-05-19 13:04 ` Cédric Le Goater
2020-05-18 5:04 ` [PATCH 18/24] display/sm501 display/ati: Fix to realize "i2c-ddc" Markus Armbruster
2020-05-18 10:32 ` BALATON Zoltan
2020-05-19 6:30 ` Markus Armbruster
2020-05-18 10:39 ` BALATON Zoltan
2020-05-18 10:45 ` Philippe Mathieu-Daudé
2020-05-19 6:35 ` Markus Armbruster
2020-05-18 5:04 ` [PATCH 19/24] riscv: Fix to put "riscv.hart_array" devices on sysbus Markus Armbruster
2020-05-18 17:03 ` Alistair Francis
2020-05-18 5:04 ` [PATCH 20/24] riscv: Fix type of SiFive[EU]SocState, member parent_obj Markus Armbruster
2020-05-18 8:58 ` Philippe Mathieu-Daudé
2020-05-18 16:57 ` Alistair Francis
2020-05-18 5:04 ` [PATCH 21/24] sparc/leon3: Fix to put grlib,* devices on sysbus Markus Armbruster
2020-05-18 8:09 ` Fred Konrad
2020-05-18 8:59 ` Philippe Mathieu-Daudé
2020-05-18 5:04 ` [PATCH 22/24] qdev: Assert devices are plugged into a bus that can take them Markus Armbruster
2020-05-18 15:03 ` Markus Armbruster
2020-05-18 20:42 ` Mark Cave-Ayland
2020-05-18 5:04 ` [PATCH 23/24] sd: Hide the qdev-but-not-quite thing created by sd_init() Markus Armbruster
2020-05-18 5:04 ` [PATCH 24/24] qdev: Assert onboard devices all get realized properly Markus Armbruster
2020-05-18 9:10 ` Philippe Mathieu-Daudé
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=20200518050408.4579-7-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=ehabkost@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.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).