| Message ID | ae0895cf31957bdd05016c7d929faa4f1d73a859.1408325386.git.peter.crosthwaite@xilinx.com |
|---|---|
| State | New |
| Headers | show |
On 18 August 2014 02:31, Peter Crosthwaite <peter.crosthwaite@xilinx.com> wrote: > This argument is a MemoryRegion and not an AddressSpace. > > "Address space" means something quite different to "memory region" > in QEMU parlance so rename the variable to reduce confusion. > > Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> Is this series missing a cover letter? (the mail headers suggest so, but perhaps it just hasn't' arrived yet). The patches tool doesn't like that. thanks -- PMM
On Mon, Aug 18, 2014 at 5:25 PM, Peter Maydell <peter.maydell@linaro.org> wrote: > On 18 August 2014 02:31, Peter Crosthwaite <peter.crosthwaite@xilinx.com> wrote: >> This argument is a MemoryRegion and not an AddressSpace. >> >> "Address space" means something quite different to "memory region" >> in QEMU parlance so rename the variable to reduce confusion. >> >> Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> > > Is this series missing a cover letter? (the mail headers suggest > so, but perhaps it just hasn't' arrived yet). The patches tool doesn't > like that. > No no cover on this one by intention. I was thinking it was short enough and self documenting. I can trivially respin right now if that helps though? Regards, Peter > thanks > -- PMM >
On 18 August 2014 08:29, Peter Crosthwaite <peter.crosthwaite@xilinx.com> wrote: > On Mon, Aug 18, 2014 at 5:25 PM, Peter Maydell <peter.maydell@linaro.org> wrote: >> Is this series missing a cover letter? (the mail headers suggest >> so, but perhaps it just hasn't' arrived yet). The patches tool doesn't >> like that. >> > > No no cover on this one by intention. I was thinking it was short > enough and self documenting. I can trivially respin right now if that > helps though? Yes, please. As well as it confusing patches, skipping the cover letter increases the chances I ignore the patches by accident, because I tend to just skip over the 1/2 2/2 emails in my inbox and wait for the 0/2 mail to mark that one for my review queue... thanks -- PMM
diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index 397e8df..aedef13 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -166,7 +166,7 @@ static void armv7m_reset(void *opaque) flash_size and sram_size are in kb. Returns the NVIC array. */ -qemu_irq *armv7m_init(MemoryRegion *address_space_mem, +qemu_irq *armv7m_init(MemoryRegion *system_memory, int flash_size, int sram_size, const char *kernel_filename, const char *cpu_model) { @@ -213,10 +213,10 @@ qemu_irq *armv7m_init(MemoryRegion *address_space_mem, memory_region_init_ram(flash, NULL, "armv7m.flash", flash_size); vmstate_register_ram_global(flash); memory_region_set_readonly(flash, true); - memory_region_add_subregion(address_space_mem, 0, flash); + memory_region_add_subregion(system_memory, 0, flash); memory_region_init_ram(sram, NULL, "armv7m.sram", sram_size); vmstate_register_ram_global(sram); - memory_region_add_subregion(address_space_mem, 0x20000000, sram); + memory_region_add_subregion(system_memory, 0x20000000, sram); armv7m_bitband_init(); nvic = qdev_create(NULL, "armv7m_nvic"); @@ -257,7 +257,7 @@ qemu_irq *armv7m_init(MemoryRegion *address_space_mem, when returning from an exception. */ memory_region_init_ram(hack, NULL, "armv7m.hack", 0x1000); vmstate_register_ram_global(hack); - memory_region_add_subregion(address_space_mem, 0xfffff000, hack); + memory_region_add_subregion(system_memory, 0xfffff000, hack); qemu_register_reset(armv7m_reset, cpu); return pic; diff --git a/include/hw/arm/arm.h b/include/hw/arm/arm.h index cbbf4ca..cefc9e6 100644 --- a/include/hw/arm/arm.h +++ b/include/hw/arm/arm.h @@ -15,7 +15,7 @@ #include "hw/irq.h" /* armv7m.c */ -qemu_irq *armv7m_init(MemoryRegion *address_space_mem, +qemu_irq *armv7m_init(MemoryRegion *system_memory, int flash_size, int sram_size, const char *kernel_filename, const char *cpu_model);
This argument is a MemoryRegion and not an AddressSpace. "Address space" means something quite different to "memory region" in QEMU parlance so rename the variable to reduce confusion. Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> --- hw/arm/armv7m.c | 8 ++++---- include/hw/arm/arm.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)