[Qemu-devel] [PATCH for-2.3] alpha: memory: Replace memory_region_init_ram with memory_region_allocate_system_memory

[Qemu-devel] [PATCH for-2.3] alpha: memory: Replace memory_region_init_ram with memory_region_allocate_system_memory

[Dirk Müller]

Commit 0b183fc871:"memory: move mem_path handling to
memory_region_allocate_system_memory" split memory_region_init_ram and
memory_region_init_ram_from_file. Also it moved mem-path handling a step
up from memory_region_init_ram to memory_region_allocate_system_memory.

Therefore for any board that uses memory_region_init_ram directly,
-mem-path is not supported.

Fix this by replacing memory_region_init_ram with
memory_region_allocate_system_memory.

Cc: Richard Henderson <rth@twiddle.net>
Signed-off-by: Dirk Mueller <dmueller@suse.com>
---
 hw/alpha/typhoon.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c
index 62af946..a6044f2 100644
--- a/hw/alpha/typhoon.c
+++ b/hw/alpha/typhoon.c
@@ -844,9 +844,8 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus,

     /* Main memory region, 0x00.0000.0000.  Real hardware supports 32GB,
        but the address space hole reserved at this point is 8TB.  */
-    memory_region_init_ram(&s->ram_region, OBJECT(s), "ram", ram_size,
-                           &error_abort);
-    vmstate_register_ram_global(&s->ram_region);
+    memory_region_allocate_system_memory(&s->ram_region, OBJECT(s), "ram",
+                                         ram_size);
     memory_region_add_subregion(addr_space, 0, &s->ram_region);

     /* TIGbus, 0x801.0000.0000, 1GB.  */
-- 
2.0.4

Re: [Qemu-devel] [PATCH for-2.3] alpha: memory: Replace memory_region_init_ram with memory_region_allocate_system_memory

[Richard Henderson]

On 04/04/2015 05:14 AM, Dirk Müller wrote:
> Therefore for any board that uses memory_region_init_ram directly,
> -mem-path is not supported.
> 
> Fix this by replacing memory_region_init_ram with
> memory_region_allocate_system_memory.
> 
> Cc: Richard Henderson <rth@twiddle.net>
> Signed-off-by: Dirk Mueller <dmueller@suse.com>
> ---
>  hw/alpha/typhoon.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)

Acked-by: Richard Henderson <rth@twiddle.net>


r~

Re: [Qemu-devel] [PATCH for-2.3] alpha: memory: Replace memory_region_init_ram with memory_region_allocate_system_memory

[Peter Maydell]

On 4 April 2015 at 19:51, Richard Henderson <rth@twiddle.net> wrote:
> On 04/04/2015 05:14 AM, Dirk Müller wrote:
>> Therefore for any board that uses memory_region_init_ram directly,
>> -mem-path is not supported.
>>
>> Fix this by replacing memory_region_init_ram with
>> memory_region_allocate_system_memory.
>>
>> Cc: Richard Henderson <rth@twiddle.net>
>> Signed-off-by: Dirk Mueller <dmueller@suse.com>
>> ---
>>  hw/alpha/typhoon.c | 5 ++---
>>  1 file changed, 2 insertions(+), 3 deletions(-)
>
> Acked-by: Richard Henderson <rth@twiddle.net>

Thanks, applied to master.

-- PMM