From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Andrew Baumann" <Andrew.Baumann@microsoft.com>,
"Aurelien Jarno" <aurelien@aurel32.net>,
kvm@vger.kernel.org,
"Alex Williamson" <alex.williamson@redhat.com>,
"Aleksandar Markovic" <amarkovic@wavecomp.com>,
"Joel Stanley" <joel@jms.id.au>,
qemu-arm@nongnu.org, "Marcelo Tosatti" <mtosatti@redhat.com>,
"Alistair Francis" <alistair@alistair23.me>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Richard Henderson" <rth@twiddle.net>,
"Aleksandar Rikalo" <aleksandar.rikalo@rt-rk.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Paul Burton" <pburton@wavecomp.com>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [PATCH 5/8] hw/mips/boston: Use memory_region_add_subregion() when priority is 0
Date: Sat, 14 Dec 2019 16:56:11 +0100 [thread overview]
Message-ID: <20191214155614.19004-6-philmd@redhat.com> (raw)
In-Reply-To: <20191214155614.19004-1-philmd@redhat.com>
It is pointless to overlap a memory subregion with priority 0.
Use the simpler memory_region_add_subregion() function.
This patch was produced with the following spatch script:
@@
expression region;
expression offset;
expression subregion;
@@
-memory_region_add_subregion_overlap(region, offset, subregion, 0)
+memory_region_add_subregion(region, offset, subregion)
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/mips/boston.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/mips/boston.c b/hw/mips/boston.c
index ca7d813a52..a27258b4d1 100644
--- a/hw/mips/boston.c
+++ b/hw/mips/boston.c
@@ -412,10 +412,10 @@ xilinx_pcie_init(MemoryRegion *sys_mem, uint32_t bus_nr,
qdev_init_nofail(dev);
cfg = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0);
- memory_region_add_subregion_overlap(sys_mem, cfg_base, cfg, 0);
+ memory_region_add_subregion(sys_mem, cfg_base, cfg);
mmio = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 1);
- memory_region_add_subregion_overlap(sys_mem, 0, mmio, 0);
+ memory_region_add_subregion(sys_mem, 0, mmio);
qdev_connect_gpio_out_named(dev, "interrupt_out", 0, irq);
@@ -471,17 +471,17 @@ static void boston_mach_init(MachineState *machine)
flash = g_new(MemoryRegion, 1);
memory_region_init_rom(flash, NULL, "boston.flash", 128 * MiB, &err);
- memory_region_add_subregion_overlap(sys_mem, 0x18000000, flash, 0);
+ memory_region_add_subregion(sys_mem, 0x18000000, flash);
ddr = g_new(MemoryRegion, 1);
memory_region_allocate_system_memory(ddr, NULL, "boston.ddr",
machine->ram_size);
- memory_region_add_subregion_overlap(sys_mem, 0x80000000, ddr, 0);
+ memory_region_add_subregion(sys_mem, 0x80000000, ddr);
ddr_low_alias = g_new(MemoryRegion, 1);
memory_region_init_alias(ddr_low_alias, NULL, "boston_low.ddr",
ddr, 0, MIN(machine->ram_size, (256 * MiB)));
- memory_region_add_subregion_overlap(sys_mem, 0, ddr_low_alias, 0);
+ memory_region_add_subregion(sys_mem, 0, ddr_low_alias);
xilinx_pcie_init(sys_mem, 0,
0x10000000, 32 * MiB,
@@ -501,7 +501,7 @@ static void boston_mach_init(MachineState *machine)
platreg = g_new(MemoryRegion, 1);
memory_region_init_io(platreg, NULL, &boston_platreg_ops, s,
"boston-platregs", 0x1000);
- memory_region_add_subregion_overlap(sys_mem, 0x17ffd000, platreg, 0);
+ memory_region_add_subregion(sys_mem, 0x17ffd000, platreg);
s->uart = serial_mm_init(sys_mem, 0x17ffe000, 2,
get_cps_irq(&s->cps, 3), 10000000,
@@ -509,7 +509,7 @@ static void boston_mach_init(MachineState *machine)
lcd = g_new(MemoryRegion, 1);
memory_region_init_io(lcd, NULL, &boston_lcd_ops, s, "boston-lcd", 0x8);
- memory_region_add_subregion_overlap(sys_mem, 0x17fff000, lcd, 0);
+ memory_region_add_subregion(sys_mem, 0x17fff000, lcd);
chr = qemu_chr_new("lcd", "vc:320x240", NULL);
qemu_chr_fe_init(&s->lcd_display, chr, NULL);
--
2.21.0
next prev parent reply other threads:[~2019-12-14 15:57 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-14 15:56 [PATCH 0/8] Simplify memory_region_add_subregion_overlap(..., priority=0) Philippe Mathieu-Daudé
2019-12-14 15:56 ` [PATCH 1/8] hw/arm/nrf51_soc: Use memory_region_add_subregion() when priority is 0 Philippe Mathieu-Daudé
2019-12-14 15:56 ` [PATCH 2/8] hw/arm/raspi: " Philippe Mathieu-Daudé
2019-12-14 15:56 ` [PATCH 3/8] hw/arm/xlnx-versal: " Philippe Mathieu-Daudé
2019-12-14 15:56 ` [PATCH 4/8] hw/i386/intel_iommu: Use memory_region_add_subregion " Philippe Mathieu-Daudé
2019-12-14 15:56 ` Philippe Mathieu-Daudé [this message]
2019-12-14 15:56 ` [PATCH 6/8] hw/vfio/pci: Use memory_region_add_subregion() " Philippe Mathieu-Daudé
2019-12-14 15:56 ` [PATCH 7/8] target/i386: " Philippe Mathieu-Daudé
2019-12-14 15:56 ` [PATCH 8/8] target/i386/cpu: Use 'mr' for MemoryRegion variables Philippe Mathieu-Daudé
2019-12-14 16:28 ` [PATCH 0/8] Simplify memory_region_add_subregion_overlap(..., priority=0) Peter Maydell
2019-12-14 18:17 ` Philippe Mathieu-Daudé
2019-12-14 20:01 ` Peter Maydell
2019-12-15 9:54 ` Michael S. Tsirkin
2019-12-15 9:51 ` Michael S. Tsirkin
2019-12-15 15:27 ` Peter Maydell
2019-12-16 11:39 ` Michael S. Tsirkin
2019-12-16 11:46 ` 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=20191214155614.19004-6-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=Andrew.Baumann@microsoft.com \
--cc=aleksandar.rikalo@rt-rk.com \
--cc=alex.williamson@redhat.com \
--cc=alistair@alistair23.me \
--cc=amarkovic@wavecomp.com \
--cc=aurelien@aurel32.net \
--cc=edgar.iglesias@gmail.com \
--cc=ehabkost@redhat.com \
--cc=joel@jms.id.au \
--cc=kvm@vger.kernel.org \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=mtosatti@redhat.com \
--cc=pbonzini@redhat.com \
--cc=pburton@wavecomp.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/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