[Qemu-devel] [PATCH v2 2/7] Add the additional parent parameter to memory region init calls
From: Mian M. Hamayun m.hama...@virtualopensystems.com The memory region init calls require an additional parent parameter, so introduce a null parent parameter to make it happy. Signed-off-by: Mian M. Hamayun m.hama...@virtualopensystems.com --- hw/arm/virt.c |2 +- hw/cpu/a57mpcore.c |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 97712d7..8a2bdc7 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -407,7 +407,7 @@ static void machvirt_init(QEMUMachineInitArgs *args) } fdt_add_cpu_nodes(virt_fdt, mi, smp_cpus); -memory_region_init_ram(ram, mach-virt.ram, ram_size); +memory_region_init_ram(ram, NULL, mach-virt.ram, ram_size); vmstate_register_ram_global(ram); memory_region_add_subregion(sysmem, mi-mem_base, ram); diff --git a/hw/cpu/a57mpcore.c b/hw/cpu/a57mpcore.c index 2923a2a..1ab6dc0 100644 --- a/hw/cpu/a57mpcore.c +++ b/hw/cpu/a57mpcore.c @@ -70,7 +70,7 @@ static int a57mp_priv_init(SysBusDevice *dev) * 0x5000-0x5fff -- GIC virtual interface control (not modelled) * 0x6000-0x7fff -- GIC virtual CPU interface (not modelled) */ -memory_region_init(s-container, a57mp-priv-container, 0x8000); +memory_region_init(s-container, NULL, a57mp-priv-container, 0x8000); memory_region_add_subregion(s-container, 0x1000, sysbus_mmio_get_region(busdev, 0)); memory_region_add_subregion(s-container, 0x2000, -- 1.7.9.5
Re: [Qemu-devel] [PATCH v2 2/7] Add the additional parent parameter to memory region init calls
Am 23.07.2013 11:33, schrieb Mian M. Hamayun: From: Mian M. Hamayun m.hama...@virtualopensystems.com The memory region init calls require an additional parent parameter, so introduce a null parent parameter to make it happy. Signed-off-by: Mian M. Hamayun m.hama...@virtualopensystems.com This is not OK for something labelled PATCH. Patch series need to be bisectable, not fixing up earlier patch series that have not been applied yet. Andreas -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
Re: [Qemu-devel] [PATCH v2 2/7] Add the additional parent parameter to memory region init calls
On 23 July 2013 10:43, Andreas Färber afaer...@suse.de wrote: Am 23.07.2013 11:33, schrieb Mian M. Hamayun: From: Mian M. Hamayun m.hama...@virtualopensystems.com The memory region init calls require an additional parent parameter, so introduce a null parent parameter to make it happy. Signed-off-by: Mian M. Hamayun m.hama...@virtualopensystems.com This is not OK for something labelled PATCH. Patch series need to be bisectable, not fixing up earlier patch series that have not been applied yet. I have a rebased version of John's mach-virt patch which includes these fixes; I haven't sent it out yet because I've still been pondering whether the create device tree nodes for everything code can be made less ugly... -- PMM
Re: [Qemu-devel] [PATCH v2 2/7] Add the additional parent parameter to memory region init calls
Am 23.07.2013 12:00, schrieb Peter Maydell: On 23 July 2013 10:43, Andreas Färber afaer...@suse.de wrote: Am 23.07.2013 11:33, schrieb Mian M. Hamayun: From: Mian M. Hamayun m.hama...@virtualopensystems.com The memory region init calls require an additional parent parameter, so introduce a null parent parameter to make it happy. Signed-off-by: Mian M. Hamayun m.hama...@virtualopensystems.com This is not OK for something labelled PATCH. Patch series need to be bisectable, not fixing up earlier patch series that have not been applied yet. I have a rebased version of John's mach-virt patch which includes these fixes; I haven't sent it out yet because I've still been pondering whether the create device tree nodes for everything code can be made less ugly... I'd also appreciate if you would update cpu/a57core.c wrt the container MemoryRegion and QOM realize (still a SysBus initfn here) - that was the intent of my a15mpcore patches I cc'ed all aarch64 people on. Andreas -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
