[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 81/80] m68k/q800: use memdev for RAM
From: |
Igor Mammedov |
Subject: |
[PATCH v4 81/80] m68k/q800: use memdev for RAM |
Date: |
Thu, 23 Jan 2020 17:14:41 +0100 |
Switch to using generic main RAM allocation. To do this set
MachineClass::default_ram_id to m68k_mac.ram and use
MachineState::ram instead of manually initializing
RAM memory region.
Signed-off-by: Igor Mammedov <address@hidden>
---
CC: address@hidden
---
hw/m68k/q800.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index 12491ec..20537f2 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -160,7 +160,6 @@ static void q800_init(MachineState *machine)
ram_addr_t initrd_base;
int32_t initrd_size;
MemoryRegion *rom;
- MemoryRegion *ram;
MemoryRegion *io;
const int io_slice_nb = (IO_SIZE / IO_SLICE) - 1;
int i;
@@ -194,9 +193,7 @@ static void q800_init(MachineState *machine)
qemu_register_reset(main_cpu_reset, cpu);
/* RAM */
- ram = g_malloc(sizeof(*ram));
- memory_region_init_ram(ram, NULL, "m68k_mac.ram", ram_size, &error_abort);
- memory_region_add_subregion(get_system_memory(), 0, ram);
+ memory_region_add_subregion(get_system_memory(), 0, machine->ram);
/*
* Memory from IO_BASE to IO_BASE + IO_SLICE is repeated
@@ -443,6 +440,7 @@ static void q800_machine_class_init(ObjectClass *oc, void
*data)
mc->max_cpus = 1;
mc->is_default = 0;
mc->block_default_type = IF_SCSI;
+ mc->default_ram_id = "m68k_mac.ram";
}
static const TypeInfo q800_machine_typeinfo = {
--
2.7.4
- [PATCH REPOST v3 77/80] hostmem: introduce "prealloc-threads" property, (continued)
- [PATCH REPOST v3 77/80] hostmem: introduce "prealloc-threads" property, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 78/80] hostmem: fix strict bind policy, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 73/80] remove no longer used memory_region_allocate_system_memory(), Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 79/80] tests:numa-test: make top level args dynamic and g_autofree(cli) cleanups, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 80/80] tests:numa-test: use explicit memdev to specify node RAM, Igor Mammedov, 2020/01/23
- Re: [PATCH REPOST v3 00/80] refactor main RAM allocation to use hostmem backend, no-reply, 2020/01/23
- Re: [PATCH REPOST v3 00/80] refactor main RAM allocation to use hostmem backend, Laurent Vivier, 2020/01/23
- [PATCH v4 81/80] m68k/q800: use memdev for RAM,
Igor Mammedov <=