[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.3] alpha: memory: Replace memory_region_init_r
From: |
Dirk Müller |
Subject: |
[Qemu-devel] [PATCH for-2.3] alpha: memory: Replace memory_region_init_ram with memory_region_allocate_system_memory |
Date: |
Sat, 4 Apr 2015 14:14:14 +0200 |
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 <address@hidden>
Signed-off-by: Dirk Mueller <address@hidden>
---
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
- [Qemu-devel] [PATCH for-2.3] alpha: memory: Replace memory_region_init_ram with memory_region_allocate_system_memory,
Dirk Müller <=