| Message ID | 20191020225650.3671-18-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | hw: Let the machine be the owner of the system memory | expand |
On 21/10/2019 00.56, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/m68k/an5206.c | 2 +- > hw/m68k/mcf5208.c | 2 +- > hw/m68k/next-cube.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c > index 54ccbe1a82..fb045c2436 100644 > --- a/hw/m68k/an5206.c > +++ b/hw/m68k/an5206.c > @@ -46,7 +46,7 @@ static void an5206_init(MachineState *machine) > env->rambar0 = AN5206_RAMBAR_ADDR | 1; > > /* DRAM at address zero */ > - memory_region_allocate_system_memory(ram, NULL, "an5206.ram", ram_size); > + memory_region_allocate_system_memory(ram, machine, "an5206.ram", ram_size); > memory_region_add_subregion(address_space_mem, 0, ram); > > /* Internal SRAM. */ > diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c > index 34d34eba17..8e8c8ef349 100644 > --- a/hw/m68k/mcf5208.c > +++ b/hw/m68k/mcf5208.c > @@ -248,7 +248,7 @@ static void mcf5208evb_init(MachineState *machine) > memory_region_add_subregion(address_space_mem, 0x00000000, rom); > > /* DRAM at 0x40000000 */ > - memory_region_allocate_system_memory(ram, NULL, "mcf5208.ram", ram_size); > + memory_region_allocate_system_memory(ram, machine, "mcf5208.ram", ram_size); > memory_region_add_subregion(address_space_mem, 0x40000000, ram); > > /* Internal SRAM. */ > diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c > index e5343348d0..6aed9376f3 100644 > --- a/hw/m68k/next-cube.c > +++ b/hw/m68k/next-cube.c > @@ -893,7 +893,7 @@ static void next_cube_init(MachineState *machine) > memcpy(ns->rtc.ram, rtc_ram2, 32); > > /* 64MB RAM starting at 0x04000000 */ > - memory_region_allocate_system_memory(ram, NULL, "next.ram", ram_size); > + memory_region_allocate_system_memory(ram, machine, "next.ram", ram_size); > memory_region_add_subregion(sysmem, 0x04000000, ram); > > /* Framebuffer */ > Reviewed-by: Thomas Huth <thuth@redhat.com>
On 10/20/19 3:56 PM, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/m68k/an5206.c | 2 +- > hw/m68k/mcf5208.c | 2 +- > hw/m68k/next-cube.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On Sun, Oct 20, 2019 at 4:20 PM Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > hw/m68k/an5206.c | 2 +- > hw/m68k/mcf5208.c | 2 +- > hw/m68k/next-cube.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c > index 54ccbe1a82..fb045c2436 100644 > --- a/hw/m68k/an5206.c > +++ b/hw/m68k/an5206.c > @@ -46,7 +46,7 @@ static void an5206_init(MachineState *machine) > env->rambar0 = AN5206_RAMBAR_ADDR | 1; > > /* DRAM at address zero */ > - memory_region_allocate_system_memory(ram, NULL, "an5206.ram", ram_size); > + memory_region_allocate_system_memory(ram, machine, "an5206.ram", ram_size); > memory_region_add_subregion(address_space_mem, 0, ram); > > /* Internal SRAM. */ > diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c > index 34d34eba17..8e8c8ef349 100644 > --- a/hw/m68k/mcf5208.c > +++ b/hw/m68k/mcf5208.c > @@ -248,7 +248,7 @@ static void mcf5208evb_init(MachineState *machine) > memory_region_add_subregion(address_space_mem, 0x00000000, rom); > > /* DRAM at 0x40000000 */ > - memory_region_allocate_system_memory(ram, NULL, "mcf5208.ram", ram_size); > + memory_region_allocate_system_memory(ram, machine, "mcf5208.ram", ram_size); > memory_region_add_subregion(address_space_mem, 0x40000000, ram); > > /* Internal SRAM. */ > diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c > index e5343348d0..6aed9376f3 100644 > --- a/hw/m68k/next-cube.c > +++ b/hw/m68k/next-cube.c > @@ -893,7 +893,7 @@ static void next_cube_init(MachineState *machine) > memcpy(ns->rtc.ram, rtc_ram2, 32); > > /* 64MB RAM starting at 0x04000000 */ > - memory_region_allocate_system_memory(ram, NULL, "next.ram", ram_size); > + memory_region_allocate_system_memory(ram, machine, "next.ram", ram_size); > memory_region_add_subregion(sysmem, 0x04000000, ram); > > /* Framebuffer */ > -- > 2.21.0 > >
diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c index 54ccbe1a82..fb045c2436 100644 --- a/hw/m68k/an5206.c +++ b/hw/m68k/an5206.c @@ -46,7 +46,7 @@ static void an5206_init(MachineState *machine) env->rambar0 = AN5206_RAMBAR_ADDR | 1; /* DRAM at address zero */ - memory_region_allocate_system_memory(ram, NULL, "an5206.ram", ram_size); + memory_region_allocate_system_memory(ram, machine, "an5206.ram", ram_size); memory_region_add_subregion(address_space_mem, 0, ram); /* Internal SRAM. */ diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c index 34d34eba17..8e8c8ef349 100644 --- a/hw/m68k/mcf5208.c +++ b/hw/m68k/mcf5208.c @@ -248,7 +248,7 @@ static void mcf5208evb_init(MachineState *machine) memory_region_add_subregion(address_space_mem, 0x00000000, rom); /* DRAM at 0x40000000 */ - memory_region_allocate_system_memory(ram, NULL, "mcf5208.ram", ram_size); + memory_region_allocate_system_memory(ram, machine, "mcf5208.ram", ram_size); memory_region_add_subregion(address_space_mem, 0x40000000, ram); /* Internal SRAM. */ diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index e5343348d0..6aed9376f3 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -893,7 +893,7 @@ static void next_cube_init(MachineState *machine) memcpy(ns->rtc.ram, rtc_ram2, 32); /* 64MB RAM starting at 0x04000000 */ - memory_region_allocate_system_memory(ram, NULL, "next.ram", ram_size); + memory_region_allocate_system_memory(ram, machine, "next.ram", ram_size); memory_region_add_subregion(sysmem, 0x04000000, ram); /* Framebuffer */
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- hw/m68k/an5206.c | 2 +- hw/m68k/mcf5208.c | 2 +- hw/m68k/next-cube.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)