diff options
| author | Igor Mammedov | 2020-02-19 17:09:13 +0100 |
|---|---|---|
| committer | Patchew Importer | 2020-02-19 17:49:57 +0100 |
| commit | c74e71908d28a9272f0c5cd7a0327d6bc3d6cba9 (patch) | |
| tree | a2ce79dbc89aa44ee056c9465b5bc161c73ad863 /hw/core/null-machine.c | |
| parent | s390x/s390-virtio-ccw: use memdev for RAM (diff) | |
| download | qemu-c74e71908d28a9272f0c5cd7a0327d6bc3d6cba9.tar.gz qemu-c74e71908d28a9272f0c5cd7a0327d6bc3d6cba9.tar.xz qemu-c74e71908d28a9272f0c5cd7a0327d6bc3d6cba9.zip | |
null-machine: use memdev for RAM
memory_region_allocate_system_memory() API is going away, so
replace it with memdev allocated MemoryRegion. The later is
initialized by generic code, so board only needs to opt in
to memdev scheme by providing
MachineClass::default_ram_id
and using MachineState::ram instead of manually initializing
RAM memory region.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200219160953.13771-40-imammedo@redhat.com>
Diffstat (limited to 'hw/core/null-machine.c')
| -rw-r--r-- | hw/core/null-machine.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c index 1aa0a9a01a..cb47d9d4f8 100644 --- a/hw/core/null-machine.c +++ b/hw/core/null-machine.c @@ -32,11 +32,8 @@ static void machine_none_init(MachineState *mch) } /* RAM at address zero */ - if (mch->ram_size) { - MemoryRegion *ram = g_new(MemoryRegion, 1); - - memory_region_allocate_system_memory(ram, NULL, "ram", mch->ram_size); - memory_region_add_subregion(get_system_memory(), 0, ram); + if (mch->ram) { + memory_region_add_subregion(get_system_memory(), 0, mch->ram); } if (mch->kernel_filename) { @@ -52,6 +49,7 @@ static void machine_none_machine_init(MachineClass *mc) mc->init = machine_none_init; mc->max_cpus = 1; mc->default_ram_size = 0; + mc->default_ram_id = "ram"; } DEFINE_MACHINE("none", machine_none_machine_init) |