motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-06 09:13:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/riscv: Let devices own the MemoryRegion they create

Browse source 
Avoid orphan memory regions being added in the /unattached QOM
container.

This commit was produced with the Coccinelle script
scripts/coccinelle/memory-region-housekeeping.cocci.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2020-02-22 18:12:57 +01:00 • committed by Paolo Bonzini
parent a845776487
commit 414c47d234
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hw/riscv/sifive_e.c
View file

@ -145,8 +145,8 @@ static void riscv_sifive_e_soc_realize(DeviceState *dev, Error **errp)
&error_abort); &error_abort);
/* Mask ROM */ /* Mask ROM */
memory_region_init_rom(&s->mask_rom, NULL, "riscv.sifive.e.mrom", memory_region_init_rom(&s->mask_rom, OBJECT(dev), "riscv.sifive.e.mrom",
memmap[SIFIVE_E_MROM].size, &error_fatal); memmap[SIFIVE_E_MROM].size, &error_fatal);
memory_region_add_subregion(sys_mem, memory_region_add_subregion(sys_mem,
memmap[SIFIVE_E_MROM].base, &s->mask_rom); memmap[SIFIVE_E_MROM].base, &s->mask_rom);
@ -208,7 +208,7 @@ static void riscv_sifive_e_soc_realize(DeviceState *dev, Error **errp)
memmap[SIFIVE_E_PWM2].base, memmap[SIFIVE_E_PWM2].size); memmap[SIFIVE_E_PWM2].base, memmap[SIFIVE_E_PWM2].size);
/* Flash memory */ /* Flash memory */
memory_region_init_rom(&s->xip_mem, NULL, "riscv.sifive.e.xip", memory_region_init_rom(&s->xip_mem, OBJECT(dev), "riscv.sifive.e.xip",
memmap[SIFIVE_E_XIP].size, &error_fatal); memmap[SIFIVE_E_XIP].size, &error_fatal);
memory_region_add_subregion(sys_mem, memmap[SIFIVE_E_XIP].base, memory_region_add_subregion(sys_mem, memmap[SIFIVE_E_XIP].base,
&s->xip_mem); &s->xip_mem);

2
hw/riscv/sifive_u.c
View file

@ -497,7 +497,7 @@ static void riscv_sifive_u_soc_realize(DeviceState *dev, Error **errp)
&error_abort); &error_abort);
/* boot rom */ /* boot rom */
memory_region_init_rom(mask_rom, NULL, "riscv.sifive.u.mrom", memory_region_init_rom(mask_rom, OBJECT(dev), "riscv.sifive.u.mrom",
memmap[SIFIVE_U_MROM].size, &error_fatal); memmap[SIFIVE_U_MROM].size, &error_fatal);
memory_region_add_subregion(system_memory, memmap[SIFIVE_U_MROM].base, memory_region_add_subregion(system_memory, memmap[SIFIVE_U_MROM].base,
mask_rom); mask_rom);