hw: Sanitize various MemoryRegion calls
Subsystems (7)
v2 cover hw: Sanitize various MemoryRegion calls
Resending after being kicked by gsmtp...
4.3.0 Temporary System Problem. Try again later (10). t81sm863436wmg.6 - gsmtp
This series simplifies various memory API calls when creating memory regions.
Most of the patches are generated with Coccinelle semantic patches (provided).
Few more cleanups added while writting the patches have been added.
v1 was 'Let devices own the MemoryRegion they create':
https://www.mail-archive.com/[email protected]/msg681960.html
Since v1:
- understood a bit more Peter Maydell comments regarding how memory devices are migrated.
Supersedes: <[email protected]>
Philippe Mathieu-Daudé (32):
memory: Correctly return alias region type
memory: Simplify memory_region_init_rom_nomigrate() to ease review scripts/cocci: Rename memory-region-{init-ram -> housekeeping} scripts/cocci: Patch to replace memory_region_init_{ram,readonly ->
rom}
hw/arm: Use memory_region_init_rom() with read-only regions hw/display: Use memory_region_init_rom() with read-only regions hw/mips: Use memory_region_init_rom() with read-only regions hw/m68k: Use memory_region_init_rom() with read-only regions hw/net: Use memory_region_init_rom() with read-only regions hw/pci-host: Use memory_region_init_rom() with read-only regions hw/ppc: Use memory_region_init_rom() with read-only regions hw/riscv: Use memory_region_init_rom() with read-only regions hw/sh4: Use memory_region_init_rom() with read-only regions hw/sparc: Use memory_region_init_rom() with read-only regions scripts/cocci: Patch to detect potential use of memory_region_init_rom hw/arm/stm32: Use memory_region_init_rom() with read-only regions hw/ppc/ppc405: Use memory_region_init_rom() with read-only regions hw/i386/pc_sysfw: Simplify using memory_region_init_alias() hw/i386/pc_sysfw: Remove unused 'ram_size' argument scripts/cocci: Patch to remove unnecessary
memory_region_set_readonly()
hw/arm: Remove unnecessary memory_region_set_readonly() on ROM alias scripts/cocci: Patch to let devices own their MemoryRegions hw/arm: Let devices own the MemoryRegion they create hw/char: Let devices own the MemoryRegion they create hw/core: Let devices own the MemoryRegion they create hw/display: Let devices own the MemoryRegion they create hw/dma: Let devices own the MemoryRegion they create hw/riscv: Let devices own the MemoryRegion they create hw/input/milkymist-softusb: Remove unused 'pmem_ptr' field hw/input/milkymist-softusb: Let devices own the MemoryRegion they
create
hw/net/milkymist-minimac2: Let devices own the MemoryRegion they
create
hw/block/onenand: Let devices own the MemoryRegion they create
.../memory-region-housekeeping.cocci | 159 ++++++++++++++++++ .../coccinelle/memory-region-init-ram.cocci | 38 ----- hw/arm/exynos4210.c | 14 +- hw/arm/fsl-imx25.c | 10 +- hw/arm/fsl-imx31.c | 6 +- hw/arm/fsl-imx6.c | 6 +- hw/arm/fsl-imx6ul.c | 9 +- hw/arm/mainstone.c | 3 +- hw/arm/msf2-soc.c | 6 +- hw/arm/nrf51_soc.c | 2 +- hw/arm/omap_sx1.c | 6 +- hw/arm/palm.c | 3 +- hw/arm/spitz.c | 3 +- hw/arm/stellaris.c | 3 +- hw/arm/stm32f205_soc.c | 11 +- hw/arm/stm32f405_soc.c | 12 +- hw/arm/tosa.c | 3 +- hw/arm/xlnx-zynqmp.c | 11 +- hw/block/onenand.c | 7 +- hw/char/serial.c | 7 +- hw/core/platform-bus.c | 3 +- hw/display/cg3.c | 5 +- hw/display/g364fb.c | 3 +- hw/display/macfb.c | 4 +- hw/display/tcx.c | 5 +- hw/dma/i8257.c | 2 +- hw/dma/rc4030.c | 4 +- hw/i386/pc_sysfw.c | 29 +--- hw/input/milkymist-softusb.c | 12 +- hw/m68k/q800.c | 3 +- hw/mips/mips_fulong2e.c | 3 +- hw/mips/mips_jazz.c | 6 +- hw/mips/mips_mipssim.c | 3 +- hw/mips/mips_r4k.c | 3 +- hw/net/dp8393x.c | 5 +- hw/net/milkymist-minimac2.c | 8 +- hw/pci-host/prep.c | 5 +- hw/ppc/mac_newworld.c | 3 +- hw/ppc/mac_oldworld.c | 3 +- hw/ppc/ppc405_boards.c | 6 +- hw/riscv/sifive_e.c | 9 +- hw/riscv/sifive_u.c | 2 +- hw/sh4/shix.c | 3 +- hw/sparc/leon3.c | 3 +- memory.c | 16 +- MAINTAINERS | 1 + 46 files changed, 268 insertions(+), 200 deletions(-) create mode 100644 scripts/coccinelle/memory-region-housekeeping.cocci delete mode 100644 scripts/coccinelle/memory-region-init-ram.cocci
Signature · 1 line
2.21.1
PATCH RESEND v2 1/32 memory: Correctly return alias region type
Since memory region aliases are neither rom nor ram, they are described as i/o, which is often incorrect. Return instead the type of the original region we are aliasing.
---
Cc: [email protected]
memory.c | 3 +++ 1 file changed, 3 insertions(+)
memory.c +3 -0
@@ -2818,6 +2818,9 @@ void address_space_destroy(AddressSpace *as)static const char *memory_region_type (MemoryRegion *mr) { +if (mr->alias) { +return memory_region_type (mr->alias); + }if (memory_region_is_ram_device (mr)) {return "ramd" ; }else if (memory_region_is_romd (mr)) {
Signature · 1 line
2.21.1
PATCH RESEND v2 2/32 memory: Simplify memory_region_init_rom_nomigrate() to ease review
In reply to Philippe Mathieu-Daudémemory_region_init_rom_nomigrate() has the same content than memory_region_init_ram_shared_nomigrate(), with setting the readonly mode. The code is easier to review as creating a readonly ram/shared/nomigrate region.
--- memory.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)
memory.c +1 -12
@@ -1659,19 +1659,8 @@ void memory_region_init_rom_nomigrate(MemoryRegion *mr,uint64_t size, Error **errp) { - Error *err = NULL; -memory_region_init (mr, owner, name, size); - mr->ram = true; +memory_region_init_ram_shared_nomigrate (mr ,owner ,name ,size ,false ,errp ); mr->readonly = true; - mr->terminates = true; - mr->destructor = memory_region_destructor_ram; - mr->ram_block =qemu_ram_alloc (size, false, mr, &err); - mr->dirty_log_mask =tcg_enabled () ? (1 <<DIRTY_MEMORY_CODE ) :0 ; -if (err) { - mr->size =int128_zero (); -object_unparent (OBJECT (mr)); -error_propagate (errp, err); - } } void memory_region_init_rom_device_nomigrate(MemoryRegion *mr,
Signature · 1 line
2.21.1
Re: [PATCH RESEND v2 02/32] memory: Simplify memory_region_init_rom_nomigrate() to ease review
Quoted 7 lines · Philippe Mathieu-Daudé
memory_region_init_rom_nomigrate()has the same content thanmemory_region_init_ram_shared_nomigrate(), with setting the readonly mode. The code is easier to review as creating a readonly ram/shared/nomigrate region.Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Alistair
Quoted 33 lines
--- memory.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)memory.c +1
-13@@ -1659,19 +1659,8 @@ void memory_region_init_rom_nomigrate(MemoryRegion *mr,uint64_t size, Error **errp) { - Error *err = NULL; -memory_region_init (mr, owner, name, size); - mr->ram = true; +memory_region_init_ram_shared_nomigrate (mr ,owner ,name ,size ,false ,errp ); mr->readonly = true; - mr->terminates = true; - mr->destructor = memory_region_destructor_ram; - mr->ram_block =qemu_ram_alloc (size, false, mr, &err); - mr->dirty_log_mask =tcg_enabled () ? (1 <<DIRTY_MEMORY_CODE ) :0 ; -if (err) { - mr->size =int128_zero (); -object_unparent (OBJECT (mr)); -error_propagate (errp, err); - } } void memory_region_init_rom_device_nomigrate(MemoryRegion *mr, --2.21.1
PATCH RESEND v2 3/32 scripts/cocci: Rename memory-region-{init-ram -> housekeeping}
In reply to Philippe Mathieu-DaudéAs we are going to add various semantic changes related to the memory region API, rename this script to be more generic.
Add a 'usage' header, and an entry in MAINTAINERS to avoid checkpatch warning.
---
...t-ram.cocci => memory-region-housekeeping.cocci} | 13 +++++++++++++
MAINTAINERS | 1 +
2 files changed, 14 insertions(+)
rename scripts/coccinelle/{memory-region-init-ram.cocci => memory-region-housekeeping.cocci} (84%)scripts/coccinelle/memory-region-housekeeping.cocci renamed from scripts/coccinelle/memory-region-init-ram.cocci +13 -0
@@ -1,3 +1,16 @@ +/* + Usage: + + spatch \ + --macro-file scripts/cocci-macro-file.h \ + --sp-file scripts/coccinelle/memory-region-housekeeping.cocci \ + --keep-comments \ + --in-place \ + --dir . + +*/ + + // Replace by-hand memory_region_init_ram_nomigrate/vmstate_register_ram // code sequences with use of the new memory_region_init_ram function. // Similarly for the _rom and _rom_device functions.
MAINTAINERS +1 -0
@@ -1998,6 +1998,7 @@ F: include/exec/ramblock.h F: memory.c F: include/exec/memory-internal.h F: exec.c +F: scripts/coccinelle/memory-region-housekeeping.cocci SPICE M: Gerd Hoffmann <[email protected]>
Signature · 1 line
2.21.1
PATCH RESEND v2 4/32 scripts/cocci: Patch to replace memory_region_init_{ram, readonly -> rom}
In reply to Philippe Mathieu-DaudéAdd a semantic patch to replace memory_region_init_ram(readonly) by memory_region_init_rom().
--- .../memory-region-housekeeping.cocci | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
scripts/coccinelle/memory-region-housekeeping.cocci +18 -0
@@ -11,6 +11,24 @@ */ +// Replace memory_region_init_ram(readonly) by memory_region_init_rom() +@@ +expression E1, E2, E3, E4, E5; +symbol true; +@@ +( +- memory_region_init_ram(E1, E2, E3, E4, E5); ++ memory_region_init_rom(E1, E2, E3, E4, E5); + ... WHEN != E1 +- memory_region_set_readonly(E1, true); +| +- memory_region_init_ram_nomigrate(E1, E2, E3, E4, E5); ++ memory_region_init_rom_nomigrate(E1, E2, E3, E4, E5); + ... WHEN != E1 +- memory_region_set_readonly(E1, true); +) + + // Replace by-hand memory_region_init_ram_nomigrate/vmstate_register_ram // code sequences with use of the new memory_region_init_ram function. // Similarly for the _rom and _rom_device functions.
Signature · 1 line
2.21.1
PATCH RESEND v2 5/32 hw/arm: Use memory_region_init_rom() with read-only regions
In reply to Philippe Mathieu-DaudéThis commit was produced with the Coccinelle script scripts/coccinelle/memory-region-housekeeping.cocci.
--- hw/arm/exynos4210.c | 3 +-- hw/arm/mainstone.c | 3 +-- hw/arm/omap_sx1.c | 6 ++---- hw/arm/palm.c | 3 +-- hw/arm/spitz.c | 3 +-- hw/arm/stellaris.c | 3 +-- hw/arm/tosa.c | 3 +-- 7 files changed, 8 insertions(+), 16 deletions(-)
hw/arm/exynos4210.c +1 -2
@@ -311,9 +311,8 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp) &s->chipid_mem);/* Internal ROM */ -memory_region_init_ram (&s->irom_mem,NULL ,"exynos4210.irom" , +memory_region_init_rom (&s->irom_mem,NULL ,"exynos4210.irom" ,EXYNOS4210_IROM_SIZE , &error_fatal); -memory_region_set_readonly (&s->irom_mem, true);memory_region_add_subregion (system_mem,EXYNOS4210_IROM_BASE_ADDR , &s->irom_mem);/* mirror of iROM */
hw/arm/mainstone.c +1 -2
@@ -125,9 +125,8 @@ static void mainstone_common_init(MemoryRegion *address_space_mem,/* Setup CPU & memory */ mpu =pxa270_init (address_space_mem, mainstone_binfo.ram_size, machine->cpu_type); -memory_region_init_ram (rom,NULL ,"mainstone.rom" ,MAINSTONE_ROM , +memory_region_init_rom (rom,NULL ,"mainstone.rom" ,MAINSTONE_ROM , &error_fatal); -memory_region_set_readonly (rom, true);memory_region_add_subregion (address_space_mem,0 , rom);#ifdef TARGET_WORDS_BIGENDIAN
hw/arm/omap_sx1.c +2 -4
@@ -126,9 +126,8 @@ static void sx1_init(MachineState *machine, const int version) mpu =omap310_mpu_init (dram, machine->cpu_type);/* External Flash (EMIFS) */ -memory_region_init_ram (flash,NULL ,"omap_sx1.flash0-0" , flash_size, +memory_region_init_rom (flash,NULL ,"omap_sx1.flash0-0" , flash_size, &error_fatal); -memory_region_set_readonly (flash, true);memory_region_add_subregion (address_space,OMAP_CS0_BASE , flash); memory_region_init_io(&cs[0], NULL, &static_ops, &cs0val,
@@ -168,9 +167,8 @@ static void sx1_init(MachineState *machine, const int version)if ((version ==1 ) && (dinfo =drive_get (IF_PFLASH ,0 , fl_idx)) !=NULL ) {MemoryRegion *flash_1 =g_new (MemoryRegion,1 ); -memory_region_init_ram (flash_1,NULL ,"omap_sx1.flash1-0" , +memory_region_init_rom (flash_1,NULL ,"omap_sx1.flash1-0" , flash1_size, &error_fatal); -memory_region_set_readonly (flash_1, true);memory_region_add_subregion (address_space,OMAP_CS1_BASE , flash_1); memory_region_init_io(&cs[1], NULL, &static_ops, &cs1val,
hw/arm/palm.c +1 -2
@@ -206,9 +206,8 @@ static void palmte_init(MachineState *machine) mpu =omap310_mpu_init (dram, machine->cpu_type);/* External Flash (EMIFS) */ -memory_region_init_ram (flash,NULL ,"palmte.flash" , flash_size, +memory_region_init_rom (flash,NULL ,"palmte.flash" , flash_size, &error_fatal); -memory_region_set_readonly (flash, true);memory_region_add_subregion (address_space_mem,OMAP_CS0_BASE , flash); memory_region_init_io(&cs[0], NULL, &static_ops, &cs0val, "palmte-cs0",
hw/arm/spitz.c +1 -2
@@ -924,8 +924,7 @@ static void spitz_common_init(MachineState *machine,sl_flash_register (mpu, (model == spitz) ?FLASH_128M :FLASH_1024M ); -memory_region_init_ram (rom,NULL ,"spitz.rom" ,SPITZ_ROM , &error_fatal); -memory_region_set_readonly (rom, true); +memory_region_init_rom (rom,NULL ,"spitz.rom" ,SPITZ_ROM , &error_fatal);memory_region_add_subregion (address_space_mem,0 , rom);/* Setup peripherals */
hw/arm/stellaris.c +1 -2
@@ -1300,9 +1300,8 @@ static void stellaris_init(MachineState *ms, stellaris_board_info *board) sram_size = ((board->dc0 >>18 ) +1 ) *1024 ;/* Flash programming is done via the SCU, so pretend it is ROM. */ -memory_region_init_ram (flash,NULL ,"stellaris.flash" , flash_size, +memory_region_init_rom (flash,NULL ,"stellaris.flash" , flash_size, &error_fatal); -memory_region_set_readonly (flash, true);memory_region_add_subregion (system_memory,0 , flash); memory_region_init_ram(sram, NULL, "stellaris.sram", sram_size,
hw/arm/tosa.c +1 -2
@@ -226,8 +226,7 @@ static void tosa_init(MachineState *machine) mpu =pxa255_init (address_space_mem, tosa_binfo.ram_size); -memory_region_init_ram (rom,NULL ,"tosa.rom" ,TOSA_ROM , &error_fatal); -memory_region_set_readonly (rom, true); +memory_region_init_rom (rom,NULL ,"tosa.rom" ,TOSA_ROM , &error_fatal);memory_region_add_subregion (address_space_mem,0 , rom); tmio = tc6393xb_init(address_space_mem, 0x10000000,
Signature · 1 line
2.21.1
PATCH RESEND v2 6/32 hw/display: Use memory_region_init_rom() with read-only regions
In reply to Philippe Mathieu-DaudéThis commit was produced with the Coccinelle script scripts/coccinelle/memory-region-housekeeping.cocci.
--- hw/display/cg3.c | 5 ++--- hw/display/tcx.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-)
hw/display/cg3.c +2 -3
@@ -287,9 +287,8 @@ static void cg3_initfn(Object *obj)SysBusDevice *sbd =SYS_BUS_DEVICE (obj);CG3State *s =CG3 (obj); -memory_region_init_ram_nomigrate (&s->rom, obj,"cg3.prom" ,FCODE_MAX_ROM_SIZE , - &error_fatal); -memory_region_set_readonly (&s->rom, true); +memory_region_init_rom_nomigrate (&s->rom, obj,"cg3.prom" , +FCODE_MAX_ROM_SIZE , &error_fatal);sysbus_init_mmio (sbd, &s->rom); memory_region_init_io(&s->reg, obj, &cg3_reg_ops, s, "cg3.reg",
hw/display/tcx.c +2 -3
@@ -755,9 +755,8 @@ static void tcx_initfn(Object *obj)SysBusDevice *sbd =SYS_BUS_DEVICE (obj);TCXState *s =TCX (obj); -memory_region_init_ram_nomigrate (&s->rom, obj,"tcx.prom" ,FCODE_MAX_ROM_SIZE , - &error_fatal); -memory_region_set_readonly (&s->rom, true); +memory_region_init_rom_nomigrate (&s->rom, obj,"tcx.prom" , +FCODE_MAX_ROM_SIZE , &error_fatal);sysbus_init_mmio (sbd, &s->rom);/* 2/STIP : Stippler */
Signature · 1 line
2.21.1
PATCH RESEND v2 7/32 hw/mips: Use memory_region_init_rom() with read-only regions
In reply to Philippe Mathieu-DaudéThis commit was produced with the Coccinelle script scripts/coccinelle/memory-region-housekeeping.cocci.
--- hw/mips/mips_fulong2e.c | 3 +-- hw/mips/mips_jazz.c | 6 ++---- hw/mips/mips_mipssim.c | 3 +-- hw/mips/mips_r4k.c | 3 +-- 4 files changed, 5 insertions(+), 10 deletions(-)
hw/mips/mips_fulong2e.c +1 -2
@@ -319,9 +319,8 @@ static void mips_fulong2e_init(MachineState *machine)/* allocate RAM */ memory_region_allocate_system_memory (ram,NULL ,"fulong2e.ram" , ram_size); -memory_region_init_ram (bios,NULL ,"fulong2e.bios" ,BIOS_SIZE , +memory_region_init_rom (bios,NULL ,"fulong2e.bios" ,BIOS_SIZE , &error_fatal); -memory_region_set_readonly (bios, true);memory_region_add_subregion (address_space_mem,0 , ram);memory_region_add_subregion (address_space_mem,0x1fc00000LL , bios);
hw/mips/mips_jazz.c +2 -4
@@ -195,9 +195,8 @@ static void mips_jazz_init(MachineState *machine, machine->ram_size);memory_region_add_subregion (address_space,0 , ram); -memory_region_init_ram (bios,NULL ,"mips_jazz.bios" ,MAGNUM_BIOS_SIZE , +memory_region_init_rom (bios,NULL ,"mips_jazz.bios" ,MAGNUM_BIOS_SIZE , &error_fatal); -memory_region_set_readonly (bios, true);memory_region_init_alias (bios2,NULL ,"mips_jazz.bios" , bios,0 ,MAGNUM_BIOS_SIZE );memory_region_add_subregion (address_space,0x1fc00000LL , bios);
@@ -263,9 +262,8 @@ static void mips_jazz_init(MachineState *machine, {/* Simple ROM, so user doesn't have to provide one */ MemoryRegion *rom_mr =g_new (MemoryRegion,1 ); -memory_region_init_ram (rom_mr,NULL ,"g364fb.rom" ,0x80000 , +memory_region_init_rom (rom_mr,NULL ,"g364fb.rom" ,0x80000 , &error_fatal); -memory_region_set_readonly (rom_mr, true);uint8_t *rom =memory_region_get_ram_ptr (rom_mr);memory_region_add_subregion (address_space,0x60000000 , rom_mr); rom[0 ] =0x10 ;/* Mips G364 */
hw/mips/mips_mipssim.c +1 -2
@@ -169,9 +169,8 @@ mips_mipssim_init(MachineState *machine)/* Allocate RAM. */ memory_region_allocate_system_memory (ram,NULL ,"mips_mipssim.ram" , ram_size); -memory_region_init_ram (bios,NULL ,"mips_mipssim.bios" ,BIOS_SIZE , +memory_region_init_rom (bios,NULL ,"mips_mipssim.bios" ,BIOS_SIZE , &error_fatal); -memory_region_set_readonly (bios, true);memory_region_add_subregion (address_space_mem,0 , ram);
hw/mips/mips_r4k.c +1 -2
@@ -241,9 +241,8 @@ void mips_r4k_init(MachineState *machine) dinfo =drive_get (IF_PFLASH ,0 ,0 );if ((bios_size >0 ) && (bios_size <=BIOS_SIZE )) { bios =g_new (MemoryRegion,1 ); -memory_region_init_ram (bios,NULL ,"mips_r4k.bios" ,BIOS_SIZE , +memory_region_init_rom (bios,NULL ,"mips_r4k.bios" ,BIOS_SIZE , &error_fatal); -memory_region_set_readonly (bios, true);memory_region_add_subregion (get_system_memory (),0x1fc00000 , bios);load_image_targphys (filename,0x1fc00000 ,BIOS_SIZE );
Signature · 1 line
2.21.1
Re: [PATCH RESEND v2 07/32] hw/mips: Use memory_region_init_rom() with read-only regions
Quoted 5 lines · Philippe Mathieu-Daudé
This commit was produced with the Coccinelle script
scripts/coccinelle/memory-region-housekeeping.cocci.Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
Will be applied to the next MIPS queue, planned to be sent in next few days.
Quoted 85 lines
hw/mips/mips_fulong2e.c | 3 +-- hw/mips/mips_jazz.c | 6 ++---- hw/mips/mips_mipssim.c | 3 +-- hw/mips/mips_r4k.c | 3 +-- 4 files changed, 5 insertions(+), 10 deletions(-)hw/mips/mips_fulong2e.c +1
-2@@ -319,9 +319,8 @@ static void mips_fulong2e_init(MachineState *machine)/* allocate RAM */ memory_region_allocate_system_memory (ram,NULL ,"fulong2e.ram" , ram_size); -memory_region_init_ram (bios,NULL ,"fulong2e.bios" ,BIOS_SIZE , +memory_region_init_rom (bios,NULL ,"fulong2e.bios" ,BIOS_SIZE , &error_fatal); -memory_region_set_readonly (bios, true);memory_region_add_subregion (address_space_mem,0 , ram);memory_region_add_subregion(address_space_mem, 0x1fc00000LL, bios);hw/mips/mips_jazz.c +2
-4@@ -195,9 +195,8 @@ static void mips_jazz_init(MachineState *machine, machine->ram_size);memory_region_add_subregion (address_space,0 , ram); -memory_region_init_ram (bios,NULL ,"mips_jazz.bios" ,MAGNUM_BIOS_SIZE , +memory_region_init_rom (bios,NULL ,"mips_jazz.bios" ,MAGNUM_BIOS_SIZE , &error_fatal); -memory_region_set_readonly (bios, true);memory_region_init_alias (bios2,NULL ,"mips_jazz.bios" , bios,0 ,MAGNUM_BIOS_SIZE );memory_region_add_subregion (address_space,0x1fc00000LL , bios);@@ -263,9 +262,8 @@ static void mips_jazz_init(MachineState *machine, {/* Simple ROM, so user doesn't have to provide one */ MemoryRegion *rom_mr =g_new (MemoryRegion,1 ); -memory_region_init_ram (rom_mr,NULL ,"g364fb.rom" ,0x80000 , +memory_region_init_rom (rom_mr,NULL ,"g364fb.rom" ,0x80000 , &error_fatal); -memory_region_set_readonly (rom_mr, true);uint8_t *rom =memory_region_get_ram_ptr (rom_mr);memory_region_add_subregion (address_space,0x60000000 , rom_mr);rom[0] = 0x10; /* Mips G364 */hw/mips/mips_mipssim.c +1
-2@@ -169,9 +169,8 @@ mips_mipssim_init(MachineState *machine)/* Allocate RAM. */ memory_region_allocate_system_memory (ram,NULL ,"mips_mipssim.ram" , ram_size); -memory_region_init_ram (bios,NULL ,"mips_mipssim.bios" ,BIOS_SIZE , +memory_region_init_rom (bios,NULL ,"mips_mipssim.bios" ,BIOS_SIZE , &error_fatal); -memory_region_set_readonly (bios, true);memory_region_add_subregion (address_space_mem,0 , ram);hw/mips/mips_r4k.c +1
-2@@ -241,9 +241,8 @@ void mips_r4k_init(MachineState *machine) dinfo =drive_get (IF_PFLASH ,0 ,0 );if ((bios_size >0 ) && (bios_size <=BIOS_SIZE )) { bios =g_new (MemoryRegion,1 ); -memory_region_init_ram (bios,NULL ,"mips_r4k.bios" ,BIOS_SIZE , +memory_region_init_rom (bios,NULL ,"mips_r4k.bios" ,BIOS_SIZE , &error_fatal); -memory_region_set_readonly (bios, true);memory_region_add_subregion (get_system_memory (),0x1fc00000 , bios);load_image_targphys(filename, 0x1fc00000, BIOS_SIZE);--
2.21.1
PATCH RESEND v2 8/32 hw/m68k: Use memory_region_init_rom() with read-only regions
In reply to Philippe Mathieu-DaudéThis commit was produced with the Coccinelle script scripts/coccinelle/memory-region-housekeeping.cocci.
--- hw/m68k/q800.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
hw/m68k/q800.c +1 -2
@@ -402,13 +402,12 @@ static void q800_init(MachineState *machine)uint8_t *ptr;/* allocate and load BIOS */ rom =g_malloc (sizeof (*rom)); -memory_region_init_ram (rom,NULL ,"m68k_mac.rom" ,MACROM_SIZE , +memory_region_init_rom (rom,NULL ,"m68k_mac.rom" ,MACROM_SIZE , &error_abort);if (bios_name ==NULL ) { bios_name =MACROM_FILENAME ; } filename =qemu_find_file (QEMU_FILE_TYPE_BIOS , bios_name); -memory_region_set_readonly (rom, true);memory_region_add_subregion (get_system_memory (),MACROM_ADDR , rom);/* Load MacROM binary */
Signature · 1 line
2.21.1
PATCH RESEND v2 9/32 hw/net: Use memory_region_init_rom() with read-only regions
In reply to Philippe Mathieu-DaudéThis commit was produced with the Coccinelle script scripts/coccinelle/memory-region-housekeeping.cocci.
--- hw/net/dp8393x.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
hw/net/dp8393x.c +2 -3
@@ -916,13 +916,12 @@ static void dp8393x_realize(DeviceState *dev, Error **errp) s->watchdog =timer_new_ns (QEMU_CLOCK_VIRTUAL , dp8393x_watchdog, s); s->regs[SONIC_SR ] =0x0004 ;/* only revision recognized by Linux */ -memory_region_init_ram (&s->prom,OBJECT (dev), -"dp8393x-prom" ,SONIC_PROM_SIZE , &local_err); +memory_region_init_rom (&s->prom,OBJECT (dev),"dp8393x-prom" , +SONIC_PROM_SIZE , &local_err);if (local_err) {error_propagate (errp, local_err);return ; } -memory_region_set_readonly (&s->prom, true); prom =memory_region_get_ram_ptr (&s->prom); checksum =0 ;for (i =0 ; i <6 ; i++) {
Signature · 1 line
2.21.1
PATCH RESEND v2 10/32 hw/pci-host: Use memory_region_init_rom() with read-only regions
In reply to Philippe Mathieu-DaudéThis commit was produced with the Coccinelle script scripts/coccinelle/memory-region-housekeeping.cocci.
--- hw/pci-host/prep.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
hw/pci-host/prep.c +2 -3
@@ -325,9 +325,8 @@ static void raven_realize(PCIDevice *d, Error **errp) d->config[0x0D ] =0x10 ;// latency_timer d->config[0x34 ] =0x00 ;// capabilities_pointer -memory_region_init_ram_nomigrate (&s->bios,OBJECT (s),"bios" ,BIOS_SIZE , - &error_fatal); -memory_region_set_readonly (&s->bios, true); +memory_region_init_rom_nomigrate (&s->bios,OBJECT (s),"bios" ,BIOS_SIZE , + &error_fatal);memory_region_add_subregion (get_system_memory (), (uint32_t )(-BIOS_SIZE ), &s->bios);if (s->bios_name) {
Signature · 1 line
2.21.1
Re: [PATCH RESEND v2 10/32] hw/pci-host: Use memory_region_init_rom() with read-only regions
Quoted 4 lines · Philippe Mathieu-Daudé
This commit was produced with the Coccinelle script
scripts/coccinelle/memory-region-housekeeping.cocci.Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Quoted 20 lines
--- hw/pci-host/prep.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)hw/pci-host/prep.c +2
-3@@ -325,9 +325,8 @@ static void raven_realize(PCIDevice *d, Error **errp) d->config[0x0D ] =0x10 ;// latency_timer d->config[0x34 ] =0x00 ;// capabilities_pointer -memory_region_init_ram_nomigrate (&s->bios,OBJECT (s),"bios" ,BIOS_SIZE , - &error_fatal); -memory_region_set_readonly (&s->bios, true); +memory_region_init_rom_nomigrate (&s->bios,OBJECT (s),"bios" ,BIOS_SIZE , + &error_fatal);memory_region_add_subregion (get_system_memory (), (uint32_t )(-BIOS_SIZE ), &s->bios);if (s->bios_name) {
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
PATCH RESEND v2 11/32 hw/ppc: Use memory_region_init_rom() with read-only regions
In reply to Philippe Mathieu-DaudéThis commit was produced with the Coccinelle script scripts/coccinelle/memory-region-housekeeping.cocci.
--- hw/ppc/mac_newworld.c | 3 +-- hw/ppc/mac_oldworld.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
hw/ppc/mac_newworld.c +1 -2
@@ -156,13 +156,12 @@ static void ppc_core99_init(MachineState *machine)memory_region_add_subregion (get_system_memory (),0 , ram);/* allocate and load BIOS */ -memory_region_init_ram (bios,NULL ,"ppc_core99.bios" ,BIOS_SIZE , +memory_region_init_rom (bios,NULL ,"ppc_core99.bios" ,BIOS_SIZE , &error_fatal);if (bios_name ==NULL ) bios_name =PROM_FILENAME ; filename =qemu_find_file (QEMU_FILE_TYPE_BIOS , bios_name); -memory_region_set_readonly (bios, true);memory_region_add_subregion (get_system_memory (),PROM_ADDR , bios);/* Load OpenBIOS (ELF) */
hw/ppc/mac_oldworld.c +1 -2
@@ -132,13 +132,12 @@ static void ppc_heathrow_init(MachineState *machine)memory_region_add_subregion (sysmem,0 , ram);/* allocate and load BIOS */ -memory_region_init_ram (bios,NULL ,"ppc_heathrow.bios" ,BIOS_SIZE , +memory_region_init_rom (bios,NULL ,"ppc_heathrow.bios" ,BIOS_SIZE , &error_fatal);if (bios_name ==NULL ) bios_name =PROM_FILENAME ; filename =qemu_find_file (QEMU_FILE_TYPE_BIOS , bios_name); -memory_region_set_readonly (bios, true);memory_region_add_subregion (sysmem,PROM_ADDR , bios);/* Load OpenBIOS (ELF) */
Signature · 1 line
2.21.1
Re: [PATCH RESEND v2 11/32] hw/ppc: Use memory_region_init_rom() with read-only regions
Quoted 4 lines · Philippe Mathieu-Daudé
This commit was produced with the Coccinelle script
scripts/coccinelle/memory-region-housekeeping.cocci.Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Quoted 43 lines
--- hw/ppc/mac_newworld.c | 3 +-- hw/ppc/mac_oldworld.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)hw/ppc/mac_newworld.c +1
-2@@ -156,13 +156,12 @@ static void ppc_core99_init(MachineState *machine)memory_region_add_subregion (get_system_memory (),0 , ram);/* allocate and load BIOS */ -memory_region_init_ram (bios,NULL ,"ppc_core99.bios" ,BIOS_SIZE , +memory_region_init_rom (bios,NULL ,"ppc_core99.bios" ,BIOS_SIZE , &error_fatal);if (bios_name ==NULL ) bios_name =PROM_FILENAME ; filename =qemu_find_file (QEMU_FILE_TYPE_BIOS , bios_name); -memory_region_set_readonly (bios, true);memory_region_add_subregion (get_system_memory (),PROM_ADDR , bios);/* Load OpenBIOS (ELF) */ hw/ppc/mac_oldworld.c +1
-2@@ -132,13 +132,12 @@ static void ppc_heathrow_init(MachineState *machine)memory_region_add_subregion (sysmem,0 , ram);/* allocate and load BIOS */ -memory_region_init_ram (bios,NULL ,"ppc_heathrow.bios" ,BIOS_SIZE , +memory_region_init_rom (bios,NULL ,"ppc_heathrow.bios" ,BIOS_SIZE , &error_fatal);if (bios_name ==NULL ) bios_name =PROM_FILENAME ; filename =qemu_find_file (QEMU_FILE_TYPE_BIOS , bios_name); -memory_region_set_readonly (bios, true);memory_region_add_subregion (sysmem,PROM_ADDR , bios);/* Load OpenBIOS (ELF) */
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
PATCH RESEND v2 12/32 hw/riscv: Use memory_region_init_rom() with read-only regions
In reply to Philippe Mathieu-DaudéThis commit was produced with the Coccinelle script scripts/coccinelle/memory-region-housekeeping.cocci.
--- hw/riscv/sifive_e.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
hw/riscv/sifive_e.c +2 -3
@@ -208,9 +208,8 @@ static void riscv_sifive_e_soc_realize(DeviceState *dev, Error **errp) memmap[SIFIVE_E_PWM2].base, memmap[SIFIVE_E_PWM2].size);/* Flash memory */ -memory_region_init_ram (&s->xip_mem,NULL ,"riscv.sifive.e.xip" , - memmap[SIFIVE_E_XIP ].size, &error_fatal); -memory_region_set_readonly (&s->xip_mem, true); +memory_region_init_rom (&s->xip_mem,NULL ,"riscv.sifive.e.xip" , + memmap[SIFIVE_E_XIP ].size, &error_fatal);memory_region_add_subregion (sys_mem, memmap[SIFIVE_E_XIP ].base, &s->xip_mem); }
Signature · 1 line
2.21.1
PATCH RESEND v2 13/32 hw/sh4: Use memory_region_init_rom() with read-only regions
In reply to Philippe Mathieu-DaudéThis commit was produced with the Coccinelle script scripts/coccinelle/memory-region-housekeeping.cocci.
--- hw/sh4/shix.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
hw/sh4/shix.c +1 -2
@@ -53,8 +53,7 @@ static void shix_init(MachineState *machine) cpu =SUPERH_CPU (cpu_create (machine->cpu_type));/* Allocate memory space */ -memory_region_init_ram (rom,NULL ,"shix.rom" ,0x4000 , &error_fatal); -memory_region_set_readonly (rom, true); +memory_region_init_rom (rom,NULL ,"shix.rom" ,0x4000 , &error_fatal);memory_region_add_subregion (sysmem,0x00000000 , rom);memory_region_init_ram (&sdram[0 ],NULL ,"shix.sdram1" ,0x01000000 , &error_fatal);
Signature · 1 line
2.21.1
PATCH RESEND v2 14/32 hw/sparc: Use memory_region_init_rom() with read-only regions
In reply to Philippe Mathieu-DaudéThis commit was produced with the Coccinelle script scripts/coccinelle/memory-region-housekeeping.cocci.
--- hw/sparc/leon3.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
hw/sparc/leon3.c +1 -2
@@ -256,8 +256,7 @@ static void leon3_generic_hw_init(MachineState *machine)/* Allocate BIOS */ prom_size =8 * MiB; -memory_region_init_ram (prom,NULL ,"Leon3.bios" , prom_size, &error_fatal); -memory_region_set_readonly (prom, true); +memory_region_init_rom (prom,NULL ,"Leon3.bios" , prom_size, &error_fatal);memory_region_add_subregion (address_space_mem,LEON3_PROM_OFFSET , prom);/* Load boot prom */
Signature · 1 line
2.21.1
Re: [PATCH RESEND v2 14/32] hw/sparc: Use memory_region_init_rom() with read-only regions
Le 2/24/20 à 9:55 PM, Philippe Mathieu-Daudé a écrit :
Quoted 4 lines
This commit was produced with the Coccinelle script
scripts/coccinelle/memory-region-housekeeping.cocci.Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Looks good to me.
Thanks,
Fred
Quoted 19 lines
--- hw/sparc/leon3.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)hw/sparc/leon3.c +1
-2@@ -256,8 +256,7 @@ static void leon3_generic_hw_init(MachineState *machine)/* Allocate BIOS */ prom_size =8 * MiB; -memory_region_init_ram (prom,NULL ,"Leon3.bios" , prom_size, &error_fatal); -memory_region_set_readonly (prom, true); +memory_region_init_rom (prom,NULL ,"Leon3.bios" , prom_size, &error_fatal);memory_region_add_subregion (address_space_mem,LEON3_PROM_OFFSET , prom);/* Load boot prom */
PATCH RESEND v2 15/32 scripts/cocci: Patch to detect potential use of memory_region_init_rom
In reply to Philippe Mathieu-DaudéAdd a semantic patch to detect potential replacement of memory_region_init_ram(readonly) by memory_region_init_rom().
--- .../memory-region-housekeeping.cocci | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
scripts/coccinelle/memory-region-housekeeping.cocci +19 -0
@@ -29,6 +29,25 @@ symbol true; ) +@possible_memory_region_init_rom@ +expression E1, E2, E3, E4, E5; +position p; +@@ +( + memory_region_init_ram@p(E1, E2, E3, E4, E5); + ... + memory_region_set_readonly(E1, true); +| + memory_region_init_ram_nomigrate@p(E1, E2, E3, E4, E5); + ... + memory_region_set_readonly(E1, true); +) +@script:python@ +p << possible_memory_region_init_rom.p; +@@ +cocci.print_main("potential use of memory_region_init_rom*() in ", p) + + // Replace by-hand memory_region_init_ram_nomigrate/vmstate_register_ram // code sequences with use of the new memory_region_init_ram function. // Similarly for the _rom and _rom_device functions.
Signature · 1 line
2.21.1
PATCH RESEND v2 16/32 hw/arm/stm32: Use memory_region_init_rom() with read-only regions
In reply to Philippe Mathieu-DaudéThe scripts/coccinelle/memory-region-housekeeping.cocci reported:
* TODO [[view:./hw/arm/stm32f205_soc.c::face=ovl-face1::linb=96::colb=4::cole=26][potential use of memory_region_init_rom*() in ./hw/arm/stm32f205_soc.c::96]]
* TODO [[view:./hw/arm/stm32f405_soc.c::face=ovl-face1::linb=98::colb=4::cole=26][potential use of memory_region_init_rom*() in ./hw/arm/stm32f405_soc.c::98]]
We can indeed replace the memory_region_init_ram() and memory_region_set_readonly() calls by memory_region_init_rom().
--- hw/arm/stm32f205_soc.c | 4 +--- hw/arm/stm32f405_soc.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-)
hw/arm/stm32f205_soc.c +1 -3
@@ -93,12 +93,10 @@ static void stm32f205_soc_realize(DeviceState *dev_soc, Error **errp)MemoryRegion *flash =g_new (MemoryRegion,1 );MemoryRegion *flash_alias =g_new (MemoryRegion,1 ); -memory_region_init_ram (flash,NULL ,"STM32F205.flash" ,FLASH_SIZE , +memory_region_init_rom (flash,NULL ,"STM32F205.flash" ,FLASH_SIZE , &error_fatal);memory_region_init_alias (flash_alias,NULL ,"STM32F205.flash.alias" , flash,0 ,FLASH_SIZE ); - -memory_region_set_readonly (flash, true);memory_region_set_readonly (flash_alias, true);memory_region_add_subregion (system_memory,FLASH_BASE_ADDRESS , flash);
hw/arm/stm32f405_soc.c +1 -3
@@ -95,7 +95,7 @@ static void stm32f405_soc_realize(DeviceState *dev_soc, Error **errp)Error *err =NULL ;int i; -memory_region_init_ram (&s->flash,NULL ,"STM32F405.flash" ,FLASH_SIZE , +memory_region_init_rom (&s->flash,NULL ,"STM32F405.flash" ,FLASH_SIZE , &err);if (err !=NULL ) {error_propagate (errp, err);
@@ -103,8 +103,6 @@ static void stm32f405_soc_realize(DeviceState *dev_soc, Error **errp) }memory_region_init_alias (&s->flash_alias,NULL ,"STM32F405.flash.alias" , &s->flash,0 ,FLASH_SIZE ); - -memory_region_set_readonly (&s->flash, true);memory_region_set_readonly (&s->flash_alias, true);memory_region_add_subregion (system_memory,FLASH_BASE_ADDRESS , &s->flash);
Signature · 1 line
2.21.1
PATCH RESEND v2 17/32 hw/ppc/ppc405: Use memory_region_init_rom() with read-only regions
In reply to Philippe Mathieu-DaudéThe scripts/coccinelle/memory-region-housekeeping.cocci reported:
* TODO [[view:./hw/ppc/ppc405_boards.c::face=ovl-face1::linb=195::colb=8::cole=30][potential use of memory_region_init_rom*() in ./hw/ppc/ppc405_boards.c::195]]
* TODO [[view:./hw/ppc/ppc405_boards.c::face=ovl-face1::linb=464::colb=8::cole=30][potential use of memory_region_init_rom*() in ./hw/ppc/ppc405_boards.c::464]]
We can indeed replace the memory_region_init_ram() and memory_region_set_readonly() calls by memory_region_init_rom().
--- hw/ppc/ppc405_boards.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
hw/ppc/ppc405_boards.c +2 -4
@@ -192,7 +192,7 @@ static void ref405ep_init(MachineState *machine)#endif { bios =g_new (MemoryRegion,1 ); -memory_region_init_ram (bios,NULL ,"ef405ep.bios" ,BIOS_SIZE , +memory_region_init_rom (bios,NULL ,"ef405ep.bios" ,BIOS_SIZE , &error_fatal);if (bios_name ==NULL )
@@ -216,7 +216,6 @@ static void ref405ep_init(MachineState *machine)/* Avoid an uninitialized variable warning */ bios_size =-1 ; } -memory_region_set_readonly (bios, true); }/* Register FPGA */ ref405ep_fpga_init (sysmem,0xF0300000 );
@@ -461,7 +460,7 @@ static void taihu_405ep_init(MachineState *machine)if (bios_name ==NULL ) bios_name =BIOS_FILENAME ; bios =g_new (MemoryRegion,1 ); -memory_region_init_ram (bios,NULL ,"taihu_405ep.bios" ,BIOS_SIZE , +memory_region_init_rom (bios,NULL ,"taihu_405ep.bios" ,BIOS_SIZE , &error_fatal); filename =qemu_find_file (QEMU_FILE_TYPE_BIOS , bios_name);if (filename) {
@@ -479,7 +478,6 @@ static void taihu_405ep_init(MachineState *machine)error_report ("Could not load PowerPC BIOS '%s'" , bios_name);exit (1 ); } -memory_region_set_readonly (bios, true); }/* Register Linux flash */ dinfo =drive_get (IF_PFLASH ,0 , fl_idx);
Signature · 1 line
2.21.1
Re: [PATCH RESEND v2 17/32] hw/ppc/ppc405: Use memory_region_init_rom() with read-only regions
Quoted 8 lines · Philippe Mathieu-Daudé
The
scripts/coccinelle/memory-region-housekeeping.coccireported:
* TODO [[view:./hw/ppc/ppc405_boards.c::face=ovl-face1::linb=195::colb=8::cole=30][potential use of memory_region_init_rom*() in ./hw/ppc/ppc405_boards.c::195]]
* TODO [[view:./hw/ppc/ppc405_boards.c::face=ovl-face1::linb=464::colb=8::cole=30][potential use of memory_region_init_rom*() in ./hw/ppc/ppc405_boards.c::464]]We can indeed replace the
memory_region_init_ram()andmemory_region_set_readonly()calls bymemory_region_init_rom().Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Quoted 42 lines
--- hw/ppc/ppc405_boards.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)hw/ppc/ppc405_boards.c +2
-4@@ -192,7 +192,7 @@ static void ref405ep_init(MachineState *machine)#endif { bios =g_new (MemoryRegion,1 ); -memory_region_init_ram (bios,NULL ,"ef405ep.bios" ,BIOS_SIZE , +memory_region_init_rom (bios,NULL ,"ef405ep.bios" ,BIOS_SIZE , &error_fatal);if (bios_name ==NULL )@@ -216,7 +216,6 @@ static void ref405ep_init(MachineState *machine)/* Avoid an uninitialized variable warning */ bios_size =-1 ; } -memory_region_set_readonly (bios, true); }/* Register FPGA */ ref405ep_fpga_init (sysmem,0xF0300000 );@@ -461,7 +460,7 @@ static void taihu_405ep_init(MachineState *machine)if (bios_name ==NULL ) bios_name =BIOS_FILENAME ; bios =g_new (MemoryRegion,1 ); -memory_region_init_ram (bios,NULL ,"taihu_405ep.bios" ,BIOS_SIZE , +memory_region_init_rom (bios,NULL ,"taihu_405ep.bios" ,BIOS_SIZE , &error_fatal); filename =qemu_find_file (QEMU_FILE_TYPE_BIOS , bios_name);if (filename) {@@ -479,7 +478,6 @@ static void taihu_405ep_init(MachineState *machine)error_report ("Could not load PowerPC BIOS '%s'" , bios_name);exit (1 ); } -memory_region_set_readonly (bios, true); }/* Register Linux flash */ dinfo =drive_get (IF_PFLASH ,0 , fl_idx);
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
PATCH RESEND v2 18/32 hw/i386/pc_sysfw: Simplify using memory_region_init_alias()
In reply to Philippe Mathieu-DaudéThe scripts/coccinelle/memory-region-housekeeping.cocci reported:
* TODO [[view:hw/i386/pc_sysfw.c::face=ovl-face1::linb=67::colb=4::cole=26][potential use of memory_region_init_rom*() in hw/i386/pc_sysfw.c::67]]
pc_isa_bios_init() does a manual copy of a part of the BIOS, from a read-only region. We can simplify by directly aliasing the same part.
Before:
(qemu) info mtree
memory-region: system
0000000000000000-ffffffffffffffff (prio 0, i/o): system
0000000000000000-0000000007ffffff (prio 0, ram): alias ram-below-4g @pc.ram 0000000000000000-0000000007ffffff
0000000000000000-ffffffffffffffff (prio -1, i/o): pci
00000000000a0000-00000000000bffff (prio 1, i/o): vga-lowmem
00000000000c0000-00000000000dffff (prio 1, rom): pc.rom
00000000000e0000-00000000000fffff (prio 1, rom): isa-bios
...
00000000fff00000-00000000ffffffff (prio 0, romd): system.flash0After:
(qemu) info mtree
memory-region: system
0000000000000000-ffffffffffffffff (prio 0, i/o): system
0000000000000000-0000000007ffffff (prio 0, ram): alias ram-below-4g @pc.ram 0000000000000000-0000000007ffffff
0000000000000000-ffffffffffffffff (prio -1, i/o): pci
00000000000a0000-00000000000bffff (prio 1, i/o): vga-lowmem
00000000000c0000-00000000000dffff (prio 1, rom): pc.rom
00000000000e0000-00000000000fffff (prio 1, romd): alias isa-bios @system.flash0 00000000000e0000-00000000000fffff
...
00000000fff00000-00000000ffffffff (prio 0, romd): system.flash0--- hw/i386/pc_sysfw.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-)
hw/i386/pc_sysfw.c +6 -18
@@ -54,31 +54,19 @@ static void pc_isa_bios_init(MemoryRegion *rom_memory,MemoryRegion *flash_mem, int ram_size) { - int isa_bios_size; -MemoryRegion *isa_bios; -uint64_t flash_size; -void *flash_ptr, *isa_bios_ptr; - - flash_size =memory_region_size (flash_mem); + uint64_t isa_bios_size; +MemoryRegion *isa_bios =g_new (MemoryRegion,1 ); +uint64_t flash_size =memory_region_size (flash_mem);/* map the last 128KB of the BIOS in ISA space */ isa_bios_size =MIN (flash_size,128 * KiB); - isa_bios =g_malloc (sizeof (*isa_bios)); -memory_region_init_ram (isa_bios,NULL ,"isa-bios" , isa_bios_size, - &error_fatal); +memory_region_init_alias (isa_bios,NULL ,"isa-bios" , flash_mem, + flash_size - isa_bios_size, + isa_bios_size);memory_region_add_subregion_overlap (rom_memory,0x100000 - isa_bios_size, isa_bios,1 ); - -/* copy ISA rom image from top of flash memory */ - flash_ptr =memory_region_get_ram_ptr (flash_mem); - isa_bios_ptr =memory_region_get_ram_ptr (isa_bios); -memcpy (isa_bios_ptr, - ((uint8_t *)flash_ptr) + (flash_size - isa_bios_size), - isa_bios_size); - -memory_region_set_readonly (isa_bios, true); } static PFlashCFI01 *pc_pflash_create(PCMachineState *pcms,
Signature · 1 line
2.21.1
Re: [PATCH RESEND v2 18/32] hw/i386/pc_sysfw: Simplify using memory_region_init_alias()
Quoted 22 lines · Philippe Mathieu-Daudé
The
scripts/coccinelle/memory-region-housekeeping.coccireported:
* TODO [[view:hw/i386/pc_sysfw.c::face=ovl-face1::linb=67::colb=4::cole=26][potential use of memory_region_init_rom*() in hw/i386/pc_sysfw.c::67]]
pc_isa_bios_init()does a manual copy of a part of the BIOS, from a read-only region. We can simplify by directly aliasing the same part.Before:
(qemu) info mtree memory-region: system 0000000000000000-ffffffffffffffff (prio 0, i/o): system 0000000000000000-0000000007ffffff (prio 0, ram): alias ram-below-4g @pc.ram 0000000000000000-0000000007ffffff 0000000000000000-ffffffffffffffff (prio -1, i/o): pci 00000000000a0000-00000000000bffff (prio 1, i/o): vga-lowmem 00000000000c0000-00000000000dffff (prio 1, rom): pc.rom 00000000000e0000-00000000000fffff (prio 1, rom): isa-bios ... 00000000fff00000-00000000ffffffff (prio 0, romd): system.flash0After:
Quoted 10 lines
(qemu) info mtree
memory-region: system
0000000000000000-ffffffffffffffff (prio 0, i/o): system
0000000000000000-0000000007ffffff (prio 0, ram): alias ram-below-4g @pc.ram 0000000000000000-0000000007ffffff
0000000000000000-ffffffffffffffff (prio -1, i/o): pci
00000000000a0000-00000000000bffff (prio 1, i/o): vga-lowmem
00000000000c0000-00000000000dffff (prio 1, rom): pc.rom
00000000000e0000-00000000000fffff (prio 1, romd): alias isa-bios @system.flash0 00000000000e0000-00000000000fffff
...
00000000fff00000-00000000ffffffff (prio 0, romd): system.flash0IIUC migrating old -> new is OK, the previous ROM copy is discarded.
What about new -> old, does it require specific handling? Do we care?
Quoted 49 lines
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- hw/i386/pc_sysfw.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-)hw/i386/pc_sysfw.c +6
-18@@ -54,31 +54,19 @@ static void pc_isa_bios_init(MemoryRegion *rom_memory,MemoryRegion *flash_mem, int ram_size) { - int isa_bios_size; -MemoryRegion *isa_bios; -uint64_t flash_size; -void *flash_ptr, *isa_bios_ptr; - - flash_size =memory_region_size (flash_mem); + uint64_t isa_bios_size; +MemoryRegion *isa_bios =g_new (MemoryRegion,1 ); +uint64_t flash_size =memory_region_size (flash_mem);/* map the last 128KB of the BIOS in ISA space */ isa_bios_size =MIN (flash_size,128 * KiB); - isa_bios =g_malloc (sizeof (*isa_bios)); -memory_region_init_ram (isa_bios,NULL ,"isa-bios" , isa_bios_size, - &error_fatal); +memory_region_init_alias (isa_bios,NULL ,"isa-bios" , flash_mem, + flash_size - isa_bios_size, + isa_bios_size);memory_region_add_subregion_overlap (rom_memory,0x100000 - isa_bios_size, isa_bios,1 ); - -/* copy ISA rom image from top of flash memory */ - flash_ptr =memory_region_get_ram_ptr (flash_mem); - isa_bios_ptr =memory_region_get_ram_ptr (isa_bios); -memcpy (isa_bios_ptr, - ((uint8_t *)flash_ptr) + (flash_size - isa_bios_size), - isa_bios_size); - -memory_region_set_readonly (isa_bios, true); } static PFlashCFI01 *pc_pflash_create(PCMachineState *pcms,
Re: [PATCH RESEND v2 18/32] hw/i386/pc_sysfw: Simplify using memory_region_init_alias()
Quoted 34 lines · Philippe Mathieu-Daudé
Quoted 21 lines
pc_isa_bios_init()does a manual copy of a part of the BIOS, from a read-only region. We can simplify by directly aliasing the same part.Before:
(qemu) info mtree
memory-region: system
0000000000000000-ffffffffffffffff (prio 0, i/o): system 0000000000000000-0000000007ffffff (prio 0, ram): alias ram-below-4g @pc.ram 0000000000000000-0000000007ffffff 0000000000000000-ffffffffffffffff (prio -1, i/o): pci 00000000000a0000-00000000000bffff (prio 1, i/o): vga-lowmem 00000000000c0000-00000000000dffff (prio 1, rom): pc.rom 00000000000e0000-00000000000fffff (prio 1, rom): isa-bios
...
00000000fff00000-00000000ffffffff (prio 0, romd): system.flash0After:
Quoted 12 lines
(qemu) info mtree
memory-region: system
0000000000000000-ffffffffffffffff (prio 0, i/o): system 0000000000000000-0000000007ffffff (prio 0, ram): alias ram-below-4g @pc.ram 0000000000000000-0000000007ffffff 0000000000000000-ffffffffffffffff (prio -1, i/o): pci 00000000000a0000-00000000000bffff (prio 1, i/o): vga-lowmem 00000000000c0000-00000000000dffff (prio 1, rom): pc.rom 00000000000e0000-00000000000fffff (prio 1, romd): alias isa-bios @system.flash0 00000000000e0000-00000000000fffff
...
00000000fff00000-00000000ffffffff (prio 0, romd): system.flash0
Quoted 3 lines
IIUC migrating old -> new is OK, the previous ROM copy is discarded.
What about new -> old, does it require specific handling? Do we care?
Old->new is broken because the "isa-bios" memory region is not found.
qemu-system-x86_64: Unknown ramblock "isa-bios", cannot accept migration
qemu-system-x86_64: error while loading state for instance 0x0 of device 'ram'
qemu-system-x86_64: load of migration failed: Invalid argument
Paolo
PATCH RESEND v2 19/32 hw/i386/pc_sysfw: Remove unused 'ram_size' argument
In reply to Philippe Mathieu-DaudéWhile named 'ram_size', this argument holds the size of the flash. Since it is unused, remove it.
---
Cc: [email protected]
hw/i386/pc_sysfw.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
hw/i386/pc_sysfw.c +2 -3
@@ -51,8 +51,7 @@#define FLASH_SECTOR_SIZE 4096static void pc_isa_bios_init (MemoryRegion *rom_memory, -MemoryRegion *flash_mem, -int ram_size) +MemoryRegion *flash_mem) {uint64_t isa_bios_size;MemoryRegion *isa_bios =g_new (MemoryRegion,1 );
@@ -182,7 +181,7 @@ static void pc_system_flash_map(PCMachineState *pcms,if (i ==0 ) { flash_mem =pflash_cfi01_get_memory (system_flash); -pc_isa_bios_init (rom_memory, flash_mem, size); +pc_isa_bios_init (rom_memory, flash_mem);/* Encrypt the pflash boot ROM */ if (kvm_memcrypt_enabled ()) {
Signature · 1 line
2.21.1
PATCH RESEND v2 20/32 scripts/cocci: Patch to remove unnecessary memory_region_set_readonly()
In reply to Philippe Mathieu-DaudéAdd a semantic patch to remove memory_region_set_readonly() calls on ROM memory regions.
--- .../coccinelle/memory-region-housekeeping.cocci | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
scripts/coccinelle/memory-region-housekeeping.cocci +15 -0
@@ -48,6 +48,21 @@ p << possible_memory_region_init_rom.p; cocci.print_main("potential use of memory_region_init_rom*() in ", p) +// Do not call memory_region_set_readonly() on ROM alias +@@ +expression ROM, E1, E2, E3, E4; +expression ALIAS, E5, E6, E7, E8; +@@ +( + memory_region_init_rom(ROM, E1, E2, E3, E4); +| + memory_region_init_rom_nomigrate(ROM, E1, E2, E3, E4); +) + ... + memory_region_init_alias(ALIAS, E5, E6, ROM, E7, E8); +- memory_region_set_readonly(ALIAS, true); + + // Replace by-hand memory_region_init_ram_nomigrate/vmstate_register_ram // code sequences with use of the new memory_region_init_ram function. // Similarly for the _rom and _rom_device functions.
Signature · 1 line
2.21.1
PATCH RESEND v2 21/32 hw/arm: Remove unnecessary memory_region_set_readonly() on ROM alias
In reply to Philippe Mathieu-DaudéThis commit was produced with the Coccinelle script scripts/coccinelle/memory-region-housekeeping.cocci.
--- hw/arm/exynos4210.c | 1 - hw/arm/stm32f205_soc.c | 1 - hw/arm/stm32f405_soc.c | 1 - 3 files changed, 3 deletions(-)
hw/arm/exynos4210.c +0 -1
@@ -320,7 +320,6 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp) &s->irom_mem,0 , EXYNOS4210_IROM_SIZE); -memory_region_set_readonly (&s->irom_alias_mem, true);memory_region_add_subregion (system_mem,EXYNOS4210_IROM_MIRROR_BASE_ADDR , &s->irom_alias_mem);
hw/arm/stm32f205_soc.c +0 -1
@@ -97,7 +97,6 @@ static void stm32f205_soc_realize(DeviceState *dev_soc, Error **errp) &error_fatal);memory_region_init_alias (flash_alias,NULL ,"STM32F205.flash.alias" , flash,0 ,FLASH_SIZE ); -memory_region_set_readonly (flash_alias, true);memory_region_add_subregion (system_memory,FLASH_BASE_ADDRESS , flash);memory_region_add_subregion (system_memory,0 , flash_alias);
hw/arm/stm32f405_soc.c +0 -1
@@ -103,7 +103,6 @@ static void stm32f405_soc_realize(DeviceState *dev_soc, Error **errp) }memory_region_init_alias (&s->flash_alias,NULL ,"STM32F405.flash.alias" , &s->flash,0 ,FLASH_SIZE ); -memory_region_set_readonly (&s->flash_alias, true);memory_region_add_subregion (system_memory,FLASH_BASE_ADDRESS , &s->flash);memory_region_add_subregion (system_memory,0 , &s->flash_alias);
Signature · 1 line
2.21.1
PATCH RESEND v2 22/32 scripts/cocci: Patch to let devices own their MemoryRegions
In reply to Philippe Mathieu-DaudéWhen a device creates a MemoryRegion without setting its ownership, the MemoryRegion is added to the machine "/unattached" container in the QOM tree.
Example with the Samsung SMDKC210 board:
$ arm-softmmu/qemu-system-arm -M smdkc210 -S -monitor stdio
(qemu) info qom-tree
/machine (smdkc210-machine)
/unattached (container)
/io[0] (qemu:memory-region)
/exynos4210.dram0[0] (qemu:memory-region)
/exynos4210.irom[0] (qemu:memory-region)
/exynos4210.iram[0] (qemu:memory-region)
/exynos4210.chipid[0] (qemu:memory-region)
...
/device[26] (exynos4210.uart)
/exynos4210.uart[0] (qemu:memory-region)
/soc (exynos4210)
^
\__ [*]The irom/iram/chipid regions should go under 'soc' at [*].
Add a semantic patch to let the device own the memory region.
---
v2: Remove memory_region_init_ram() change which might break migration
(Peter Maydell)
--- .../memory-region-housekeeping.cocci | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+)
scripts/coccinelle/memory-region-housekeeping.cocci +56 -0
@@ -101,3 +101,59 @@ expression ERRP; +memory_region_init_rom_device(MR, NULL, OPS, OPAQUE, NAME, SIZE, ERRP); ... -vmstate_register_ram_global(MR); + + +// Device is owner +@@ +typedef DeviceState; +identifier device_fn, dev, obj; +expression E1, E2, E3, E4, E5; +@@ +static void device_fn(DeviceState *dev, ...) +{ + ... + Object *obj = OBJECT(dev); + <+... +( +- memory_region_init(E1, NULL, E2, E3); ++ memory_region_init(E1, obj, E2, E3); +| +- memory_region_init_io(E1, NULL, E2, E3, E4, E5); ++ memory_region_init_io(E1, obj, E2, E3, E4, E5); +| +- memory_region_init_alias(E1, NULL, E2, E3, E4, E5); ++ memory_region_init_alias(E1, obj, E2, E3, E4, E5); +| +- memory_region_init_rom(E1, NULL, E2, E3, E4); ++ memory_region_init_rom(E1, obj, E2, E3, E4); +| +- memory_region_init_ram_shared_nomigrate(E1, NULL, E2, E3, E4, E5); ++ memory_region_init_ram_shared_nomigrate(E1, obj, E2, E3, E4, E5); +) + ...+> +} +@@ +identifier device_fn, dev; +expression E1, E2, E3, E4, E5; +@@ +static void device_fn(DeviceState *dev, ...) +{ + <+... +( +- memory_region_init(E1, NULL, E2, E3); ++ memory_region_init(E1, OBJECT(dev), E2, E3); +| +- memory_region_init_io(E1, NULL, E2, E3, E4, E5); ++ memory_region_init_io(E1, OBJECT(dev), E2, E3, E4, E5); +| +- memory_region_init_alias(E1, NULL, E2, E3, E4, E5); ++ memory_region_init_alias(E1, OBJECT(dev), E2, E3, E4, E5); +| +- memory_region_init_rom(E1, NULL, E2, E3, E4); ++ memory_region_init_rom(E1, OBJECT(dev), E2, E3, E4); +| +- memory_region_init_ram_shared_nomigrate(E1, NULL, E2, E3, E4, E5); ++ memory_region_init_ram_shared_nomigrate(E1, OBJECT(dev), E2, E3, E4, E5); +) + ...+> +}
Signature · 1 line
2.21.1
PATCH RESEND v2 23/32 hw/arm: Let devices own the MemoryRegion they create
In reply to Philippe Mathieu-Daudé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.
--- hw/arm/exynos4210.c | 12 ++++++------ hw/arm/fsl-imx25.c | 10 +++++----- hw/arm/fsl-imx31.c | 6 +++--- hw/arm/fsl-imx6.c | 6 +++--- hw/arm/fsl-imx6ul.c | 9 +++++---- hw/arm/msf2-soc.c | 6 +++--- hw/arm/nrf51_soc.c | 2 +- hw/arm/stm32f205_soc.c | 8 ++++---- hw/arm/stm32f405_soc.c | 9 +++++---- hw/arm/xlnx-zynqmp.c | 11 +++++------ 10 files changed, 40 insertions(+), 39 deletions(-)
hw/arm/exynos4210.c +6 -6
@@ -305,20 +305,20 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp)/*** Memory ***/ /* Chip-ID and OMR */ -memory_region_init_io (&s->chipid_mem,NULL , &exynos4210_chipid_and_omr_ops, -NULL ,"exynos4210.chipid" ,sizeof (chipid_and_omr)); +memory_region_init_io (&s->chipid_mem,OBJECT (socdev), + &exynos4210_chipid_and_omr_ops,NULL , +"exynos4210.chipid" ,sizeof (chipid_and_omr));memory_region_add_subregion (system_mem,EXYNOS4210_CHIPID_ADDR , &s->chipid_mem);/* Internal ROM */ -memory_region_init_rom (&s->irom_mem,NULL ,"exynos4210.irom" , +memory_region_init_rom (&s->irom_mem,OBJECT (socdev),"exynos4210.irom" ,EXYNOS4210_IROM_SIZE , &error_fatal);memory_region_add_subregion (system_mem,EXYNOS4210_IROM_BASE_ADDR , &s->irom_mem);/* mirror of iROM */ -memory_region_init_alias (&s->irom_alias_mem,NULL ,"exynos4210.irom_alias" , - &s->irom_mem, -0 , +memory_region_init_alias (&s->irom_alias_mem,OBJECT (socdev), +"exynos4210.irom_alias" , &s->irom_mem,0 ,EXYNOS4210_IROM_SIZE );memory_region_add_subregion (system_mem,EXYNOS4210_IROM_MIRROR_BASE_ADDR , &s->irom_alias_mem);
hw/arm/fsl-imx25.c +5 -5
@@ -247,16 +247,16 @@ static void fsl_imx25_realize(DeviceState *dev, Error **errp) }/* initialize 2 x 16 KB ROM */ -memory_region_init_rom (&s->rom[0 ],NULL , -"imx25.rom0" ,FSL_IMX25_ROM0_SIZE , &err); +memory_region_init_rom (&s->rom[0 ],OBJECT (dev),"imx25.rom0" , +FSL_IMX25_ROM0_SIZE , &err);if (err) {error_propagate (errp, err);return ; }memory_region_add_subregion (get_system_memory (),FSL_IMX25_ROM0_ADDR , &s->rom[0 ]); -memory_region_init_rom (&s->rom[1 ],NULL , -"imx25.rom1" ,FSL_IMX25_ROM1_SIZE , &err); +memory_region_init_rom (&s->rom[1 ],OBJECT (dev),"imx25.rom1" , +FSL_IMX25_ROM1_SIZE , &err);if (err) {error_propagate (errp, err);return ;
@@ -275,7 +275,7 @@ static void fsl_imx25_realize(DeviceState *dev, Error **errp) &s->iram);/* internal RAM (128 KB) is aliased over 128 MB - 128 KB */ -memory_region_init_alias (&s->iram_alias,NULL ,"imx25.iram_alias" , +memory_region_init_alias (&s->iram_alias,OBJECT (dev),"imx25.iram_alias" , &s->iram,0 ,FSL_IMX25_IRAM_ALIAS_SIZE );memory_region_add_subregion (get_system_memory (),FSL_IMX25_IRAM_ALIAS_ADDR , &s->iram_alias);
hw/arm/fsl-imx31.c +3 -3
@@ -206,7 +206,7 @@ static void fsl_imx31_realize(DeviceState *dev, Error **errp) }/* On a real system, the first 16k is a `secure boot rom' */ -memory_region_init_rom (&s->secure_rom,NULL ,"imx31.secure_rom" , +memory_region_init_rom (&s->secure_rom,OBJECT (dev),"imx31.secure_rom" ,FSL_IMX31_SECURE_ROM_SIZE , &err);if (err) {error_propagate (errp, err);
@@ -216,7 +216,7 @@ static void fsl_imx31_realize(DeviceState *dev, Error **errp) &s->secure_rom);/* There is also a 16k ROM */ -memory_region_init_rom (&s->rom,NULL ,"imx31.rom" , +memory_region_init_rom (&s->rom,OBJECT (dev),"imx31.rom" ,FSL_IMX31_ROM_SIZE , &err);if (err) {error_propagate (errp, err);
@@ -236,7 +236,7 @@ static void fsl_imx31_realize(DeviceState *dev, Error **errp) &s->iram);/* internal RAM (16 KB) is aliased over 256 MB - 16 KB */ -memory_region_init_alias (&s->iram_alias,NULL ,"imx31.iram_alias" , +memory_region_init_alias (&s->iram_alias,OBJECT (dev),"imx31.iram_alias" , &s->iram,0 ,FSL_IMX31_IRAM_ALIAS_SIZE );memory_region_add_subregion (get_system_memory (),FSL_IMX31_IRAM_ALIAS_ADDR , &s->iram_alias);
hw/arm/fsl-imx6.c +3 -3
@@ -405,7 +405,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) }/* ROM memory */ -memory_region_init_rom (&s->rom,NULL ,"imx6.rom" , +memory_region_init_rom (&s->rom,OBJECT (dev),"imx6.rom" ,FSL_IMX6_ROM_SIZE , &err);if (err) {error_propagate (errp, err);
@@ -415,7 +415,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) &s->rom);/* CAAM memory */ -memory_region_init_rom (&s->caam,NULL ,"imx6.caam" , +memory_region_init_rom (&s->caam,OBJECT (dev),"imx6.caam" ,FSL_IMX6_CAAM_MEM_SIZE , &err);if (err) {error_propagate (errp, err);
@@ -435,7 +435,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) &s->ocram);/* internal OCRAM (256 KB) is aliased over 1 MB */ -memory_region_init_alias (&s->ocram_alias,NULL ,"imx6.ocram_alias" , +memory_region_init_alias (&s->ocram_alias,OBJECT (dev),"imx6.ocram_alias" , &s->ocram,0 ,FSL_IMX6_OCRAM_ALIAS_SIZE );memory_region_add_subregion (get_system_memory (),FSL_IMX6_OCRAM_ALIAS_ADDR , &s->ocram_alias);
hw/arm/fsl-imx6ul.c +5 -4
@@ -543,7 +543,7 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp)/* * ROM memory */ -memory_region_init_rom (&s->rom,NULL ,"imx6ul.rom" , +memory_region_init_rom (&s->rom,OBJECT (dev),"imx6ul.rom" ,FSL_IMX6UL_ROM_SIZE , &error_abort);memory_region_add_subregion (get_system_memory (),FSL_IMX6UL_ROM_ADDR , &s->rom);
@@ -551,7 +551,7 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp)/* * CAAM memory */ -memory_region_init_rom (&s->caam,NULL ,"imx6ul.caam" , +memory_region_init_rom (&s->caam,OBJECT (dev),"imx6ul.caam" ,FSL_IMX6UL_CAAM_MEM_SIZE , &error_abort);memory_region_add_subregion (get_system_memory (),FSL_IMX6UL_CAAM_MEM_ADDR , &s->caam);
@@ -568,8 +568,9 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp)/* * internal OCRAM (128 KB) is aliased over 512 KB */ -memory_region_init_alias (&s->ocram_alias,NULL ,"imx6ul.ocram_alias" , - &s->ocram,0 ,FSL_IMX6UL_OCRAM_ALIAS_SIZE ); +memory_region_init_alias (&s->ocram_alias,OBJECT (dev), +"imx6ul.ocram_alias" , &s->ocram,0 , +FSL_IMX6UL_OCRAM_ALIAS_SIZE );memory_region_add_subregion (get_system_memory (),FSL_IMX6UL_OCRAM_ALIAS_ADDR , &s->ocram_alias); }
hw/arm/msf2-soc.c +3 -3
@@ -96,7 +96,7 @@ static void m2sxxx_soc_realize(DeviceState *dev_soc, Error **errp)MemoryRegion *nvm_alias =g_new (MemoryRegion,1 );MemoryRegion *sram =g_new (MemoryRegion,1 ); -memory_region_init_rom (nvm,NULL ,"MSF2.eNVM" , s->envm_size, +memory_region_init_rom (nvm,OBJECT (dev_soc),"MSF2.eNVM" , s->envm_size, &error_fatal);/* * On power-on, the eNVM region 0x60000000 is automatically
@@ -104,8 +104,8 @@ static void m2sxxx_soc_realize(DeviceState *dev_soc, Error **errp)* start address (0x0). We do not support remapping other eNVM, * eSRAM and DDR regions by guest(via Sysreg) currently. */ -memory_region_init_alias (nvm_alias,NULL ,"MSF2.eNVM" , - nvm,0 , s->envm_size); +memory_region_init_alias (nvm_alias,OBJECT (dev_soc),"MSF2.eNVM" , nvm,0 , + s->envm_size);memory_region_add_subregion (system_memory,ENVM_BASE_ADDRESS , nvm);memory_region_add_subregion (system_memory,0 , nvm_alias);
hw/arm/nrf51_soc.c +1 -1
@@ -165,7 +165,7 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp) }/* STUB Peripherals */ -memory_region_init_io (&s->clock,NULL , &clock_ops,NULL , +memory_region_init_io (&s->clock,OBJECT (dev_soc), &clock_ops,NULL ,"nrf51_soc.clock" ,0x1000 );memory_region_add_subregion_overlap (&s->container,NRF51_IOMEM_BASE , &s->clock,-1 );
hw/arm/stm32f205_soc.c +4 -4
@@ -93,10 +93,10 @@ static void stm32f205_soc_realize(DeviceState *dev_soc, Error **errp)MemoryRegion *flash =g_new (MemoryRegion,1 );MemoryRegion *flash_alias =g_new (MemoryRegion,1 ); -memory_region_init_rom (flash,NULL ,"STM32F205.flash" ,FLASH_SIZE , - &error_fatal); -memory_region_init_alias (flash_alias,NULL ,"STM32F205.flash.alias" , - flash,0 ,FLASH_SIZE ); +memory_region_init_rom (flash,OBJECT (dev_soc),"STM32F205.flash" , +FLASH_SIZE , &error_fatal); +memory_region_init_alias (flash_alias,OBJECT (dev_soc), +"STM32F205.flash.alias" , flash,0 ,FLASH_SIZE );memory_region_add_subregion (system_memory,FLASH_BASE_ADDRESS , flash);memory_region_add_subregion (system_memory,0 , flash_alias);
hw/arm/stm32f405_soc.c +5 -4
@@ -95,14 +95,15 @@ static void stm32f405_soc_realize(DeviceState *dev_soc, Error **errp)Error *err =NULL ;int i; -memory_region_init_rom (&s->flash,NULL ,"STM32F405.flash" ,FLASH_SIZE , - &err); +memory_region_init_rom (&s->flash,OBJECT (dev_soc),"STM32F405.flash" , +FLASH_SIZE , &err);if (err !=NULL ) {error_propagate (errp, err);return ; } -memory_region_init_alias (&s->flash_alias,NULL ,"STM32F405.flash.alias" , - &s->flash,0 ,FLASH_SIZE ); +memory_region_init_alias (&s->flash_alias,OBJECT (dev_soc), +"STM32F405.flash.alias" , &s->flash,0 , +FLASH_SIZE );memory_region_add_subregion (system_memory,FLASH_BASE_ADDRESS , &s->flash);memory_region_add_subregion (system_memory,0 , &s->flash_alias);
hw/arm/xlnx-zynqmp.c +5 -6
@@ -318,9 +318,9 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) ddr_low_size =XLNX_ZYNQMP_MAX_LOW_RAM_SIZE ; ddr_high_size = ram_size -XLNX_ZYNQMP_MAX_LOW_RAM_SIZE ; -memory_region_init_alias (&s->ddr_ram_high,NULL , -"ddr-ram-high" , s->ddr_ram, - ddr_low_size, ddr_high_size); +memory_region_init_alias (&s->ddr_ram_high,OBJECT (dev), +"ddr-ram-high" , s->ddr_ram, ddr_low_size, + ddr_high_size);memory_region_add_subregion (get_system_memory (),XLNX_ZYNQMP_HIGH_RAM_START , &s->ddr_ram_high);
@@ -330,9 +330,8 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) ddr_low_size = ram_size; } -memory_region_init_alias (&s->ddr_ram_low,NULL , -"ddr-ram-low" , s->ddr_ram, -0 , ddr_low_size); +memory_region_init_alias (&s->ddr_ram_low,OBJECT (dev),"ddr-ram-low" , + s->ddr_ram,0 , ddr_low_size);memory_region_add_subregion (get_system_memory (),0 , &s->ddr_ram_low);/* Create the four OCM banks */
Signature · 1 line
2.21.1
PATCH RESEND v2 24/32 hw/char: Let devices own the MemoryRegion they create
In reply to Philippe Mathieu-Daudé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.
--- hw/char/serial.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
hw/char/serial.c +4 -3
@@ -997,7 +997,7 @@ static void serial_io_realize(DeviceState *dev, Error **errp)return ; } -memory_region_init_io (&s->io,NULL , &serial_io_ops, s,"serial" ,8 ); +memory_region_init_io (&s->io,OBJECT (dev), &serial_io_ops, s,"serial" ,8 );sysbus_init_mmio (SYS_BUS_DEVICE (sio), &s->io);sysbus_init_irq (SYS_BUS_DEVICE (sio), &s->irq); }
@@ -1106,8 +1106,9 @@ static void serial_mm_realize(DeviceState *dev, Error **errp)return ; } -memory_region_init_io (&s->io,NULL , &serial_mm_ops[smm->endianness], smm, -"serial" ,8 << smm->regshift); +memory_region_init_io (&s->io,OBJECT (dev), + &serial_mm_ops[smm->endianness], smm,"serial" , +8 << smm->regshift);sysbus_init_mmio (SYS_BUS_DEVICE (smm), &s->io);sysbus_init_irq (SYS_BUS_DEVICE (smm), &smm->serial.irq); }
Signature · 1 line
2.21.1
PATCH RESEND v2 25/32 hw/core: Let devices own the MemoryRegion they create
In reply to Philippe Mathieu-Daudé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.
--- hw/core/platform-bus.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
hw/core/platform-bus.c +2 -1
@@ -187,7 +187,8 @@ static void platform_bus_realize(DeviceState *dev, Error **errp) d =SYS_BUS_DEVICE (dev); pbus =PLATFORM_BUS_DEVICE (dev); -memory_region_init (&pbus->mmio,NULL ,"platform bus" , pbus->mmio_size); +memory_region_init (&pbus->mmio,OBJECT (dev),"platform bus" , + pbus->mmio_size);sysbus_init_mmio (d, &pbus->mmio); pbus->used_irqs =bitmap_new (pbus->num_irqs);
Signature · 1 line
2.21.1
PATCH RESEND v2 26/32 hw/display: Let devices own the MemoryRegion they create
In reply to Philippe Mathieu-Daudé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.
--- hw/display/g364fb.c | 3 ++- hw/display/macfb.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-)
hw/display/g364fb.c +2 -1
@@ -477,7 +477,8 @@ static void g364fb_init(DeviceState *dev, G364State *s) s->con =graphic_console_init (dev,0 , &g364fb_ops, s); -memory_region_init_io (&s->mem_ctrl,NULL , &g364fb_ctrl_ops, s,"ctrl" ,0x180000 ); +memory_region_init_io (&s->mem_ctrl,OBJECT (dev), &g364fb_ctrl_ops, s, +"ctrl" ,0x180000 );memory_region_init_ram_ptr (&s->mem_vram,NULL ,"vram" , s->vram_size, s->vram);vmstate_register_ram (&s->mem_vram, dev);
hw/display/macfb.c +2 -2
@@ -362,8 +362,8 @@ static void macfb_common_realize(DeviceState *dev, MacfbState *s, Error **errp)return ; } -memory_region_init_io (&s->mem_ctrl,NULL , &macfb_ctrl_ops, s,"macfb-ctrl" , -0x1000 ); +memory_region_init_io (&s->mem_ctrl,OBJECT (dev), &macfb_ctrl_ops, s, +"macfb-ctrl" ,0x1000 );memory_region_init_ram_nomigrate (&s->mem_vram,OBJECT (s),"macfb-vram" ,MACFB_VRAM_SIZE , errp);
Signature · 1 line
2.21.1
PATCH RESEND v2 27/32 hw/dma: Let devices own the MemoryRegion they create
In reply to Philippe Mathieu-Daudé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.
--- hw/dma/i8257.c | 2 +- hw/dma/rc4030.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
hw/dma/i8257.c +1 -1
@@ -553,7 +553,7 @@ static void i8257_realize(DeviceState *dev, Error **errp)I8257State *d =I8257 (dev);int i; -memory_region_init_io (&d->channel_io,NULL , &channel_io_ops, d, +memory_region_init_io (&d->channel_io,OBJECT (dev), &channel_io_ops, d,"dma-chan" ,8 << d->dshift);memory_region_add_subregion (isa_address_space_io (isa), d->base, &d->channel_io);
hw/dma/rc4030.c +2 -2
@@ -679,9 +679,9 @@ static void rc4030_realize(DeviceState *dev, Error **errp) s->periodic_timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , rc4030_periodic_timer, s); -memory_region_init_io (&s->iomem_chipset,NULL , &rc4030_ops, s, +memory_region_init_io (&s->iomem_chipset, o, &rc4030_ops, s,"rc4030.chipset" ,0x300 ); -memory_region_init_io (&s->iomem_jazzio,NULL , &jazzio_ops, s, +memory_region_init_io (&s->iomem_jazzio, o, &jazzio_ops, s,"rc4030.jazzio" ,0x00001000 ); memory_region_init_iommu(&s->dma_mr, sizeof(s->dma_mr),
Signature · 1 line
2.21.1
PATCH RESEND v2 28/32 hw/riscv: Let devices own the MemoryRegion they create
In reply to Philippe Mathieu-Daudé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.
--- hw/riscv/sifive_e.c | 6 +++--- hw/riscv/sifive_u.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
hw/riscv/sifive_e.c +3 -3
@@ -145,8 +145,8 @@ static void riscv_sifive_e_soc_realize(DeviceState *dev, Error **errp) &error_abort);/* Mask ROM */ -memory_region_init_rom (&s->mask_rom,NULL ,"riscv.sifive.e.mrom" , - memmap[SIFIVE_E_MROM ].size, &error_fatal); +memory_region_init_rom (&s->mask_rom,OBJECT (dev),"riscv.sifive.e.mrom" , + memmap[SIFIVE_E_MROM ].size, &error_fatal);memory_region_add_subregion (sys_mem, 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);/* 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);memory_region_add_subregion (sys_mem, memmap[SIFIVE_E_XIP ].base, &s->xip_mem);
hw/riscv/sifive_u.c +1 -1
@@ -497,7 +497,7 @@ static void riscv_sifive_u_soc_realize(DeviceState *dev, Error **errp) &error_abort);/* 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);memory_region_add_subregion (system_memory, memmap[SIFIVE_U_MROM ].base, mask_rom);
Signature · 1 line
2.21.1
PATCH RESEND v2 29/32 hw/input/milkymist-softusb: Remove unused 'pmem_ptr' field
In reply to Philippe Mathieu-DaudéIn commit 029ad4bcf3 we removed softusb_{read, write}_pmem(), we can also remove the 'pmem_ptr' field.
---
Cc: [email protected]
hw/input/milkymist-softusb.c | 2 -- 1 file changed, 2 deletions(-)
hw/input/milkymist-softusb.c +0 -2
@@ -64,7 +64,6 @@ struct MilkymistSoftUsbState {MemoryRegion dmem;qemu_irq irq; -void *pmem_ptr;void *dmem_ptr;/* device properties */
@@ -263,7 +262,6 @@ static void milkymist_softusb_realize(DeviceState *dev, Error **errp)memory_region_init_ram_nomigrate (&s->pmem,OBJECT (s),"milkymist-softusb.pmem" , s->pmem_size, &error_fatal);vmstate_register_ram_global (&s->pmem); - s->pmem_ptr =memory_region_get_ram_ptr (&s->pmem);sysbus_init_mmio (sbd, &s->pmem);memory_region_init_ram_nomigrate (&s->dmem,OBJECT (s),"milkymist-softusb.dmem" , s->dmem_size, &error_fatal);
Signature · 1 line
2.21.1
RFC PATCH v2 30/32 hw/input/milkymist-softusb: Let devices own the MemoryRegion they create
In reply to Philippe Mathieu-DaudéAvoid orphan memory regions being added in the /unattached QOM container.
Note this change break the migration of the LM32 milkymist machine.
--- hw/input/milkymist-softusb.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
hw/input/milkymist-softusb.c +4 -6
@@ -259,13 +259,11 @@ static void milkymist_softusb_realize(DeviceState *dev, Error **errp)sysbus_init_mmio (sbd, &s->regs_region);/* register pmem and dmem */ -memory_region_init_ram_nomigrate (&s->pmem,OBJECT (s),"milkymist-softusb.pmem" , +memory_region_init_ram (&s->pmem,OBJECT (s),"milkymist-softusb.pmem" , s->pmem_size, &error_fatal); -vmstate_register_ram_global (&s->pmem);sysbus_init_mmio (sbd, &s->pmem); -memory_region_init_ram_nomigrate (&s->dmem,OBJECT (s),"milkymist-softusb.dmem" , +memory_region_init_ram (&s->dmem,OBJECT (s),"milkymist-softusb.dmem" , s->dmem_size, &error_fatal); -vmstate_register_ram_global (&s->dmem); s->dmem_ptr =memory_region_get_ram_ptr (&s->dmem);sysbus_init_mmio (sbd, &s->dmem);
@@ -275,8 +273,8 @@ static void milkymist_softusb_realize(DeviceState *dev, Error **errp)static const VMStateDescription vmstate_milkymist_softusb = { .name ="milkymist-softusb" , - .version_id =1 , - .minimum_version_id =1 , + .version_id =2 , + .minimum_version_id =2 , .fields = (VMStateField []) {VMSTATE_UINT32_ARRAY (regs, MilkymistSoftUsbState,R_MAX ),VMSTATE_HID_KEYBOARD_DEVICE (hid_kbd, MilkymistSoftUsbState),
Signature · 1 line
2.21.1
RFC PATCH v2 31/32 hw/net/milkymist-minimac2: Let devices own the MemoryRegion they create
In reply to Philippe Mathieu-DaudéAvoid orphan memory regions being added in the /unattached QOM container.
Note this change break the migration of the LM32 milkymist machine.
--- hw/net/milkymist-minimac2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
hw/net/milkymist-minimac2.c +4 -4
@@ -473,9 +473,9 @@ static void milkymist_minimac2_realize(DeviceState *dev, Error **errp)sysbus_init_mmio (sbd, &s->regs_region);/* register buffers memory */ -memory_region_init_ram_nomigrate (&s->buffers,OBJECT (dev),"milkymist-minimac2.buffers" , +memory_region_init_ram (&s->buffers,OBJECT (dev), +"milkymist-minimac2.buffers" , buffers_size, &error_fatal); -vmstate_register_ram_global (&s->buffers); s->rx0_buf =memory_region_get_ram_ptr (&s->buffers); s->rx1_buf = s->rx0_buf +MINIMAC2_BUFFER_SIZE ; s->tx_buf = s->rx1_buf +MINIMAC2_BUFFER_SIZE ;
@@ -506,8 +506,8 @@ static const VMStateDescription vmstate_milkymist_minimac2_mdio = {static const VMStateDescription vmstate_milkymist_minimac2 = { .name ="milkymist-minimac2" , - .version_id =1 , - .minimum_version_id =1 , + .version_id =2 , + .minimum_version_id =2 , .fields = (VMStateField []) {VMSTATE_UINT32_ARRAY (regs, MilkymistMinimac2State,R_MAX ),VMSTATE_UINT16_ARRAY (phy_regs, MilkymistMinimac2State,R_PHY_MAX ),
Signature · 1 line
2.21.1
RFC PATCH v2 32/32 hw/block/onenand: Let devices own the MemoryRegion they create
In reply to Philippe Mathieu-DaudéAvoid orphan memory regions being added in the /unattached QOM container.
Note this change break the migration of the nSeries machines.
--- hw/block/onenand.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
hw/block/onenand.c +3 -4
@@ -173,8 +173,8 @@ static int onenand_post_load(void *opaque, int version_id)static const VMStateDescription vmstate_onenand = { .name ="onenand" , - .version_id =1 , - .minimum_version_id =1 , + .version_id =2 , + .minimum_version_id =2 , .pre_save = onenand_pre_save, .post_load = onenand_post_load, .fields = (VMStateField []) {
@@ -809,9 +809,8 @@ static void onenand_realize(DeviceState *dev, Error **errp) } s->otp =memset (g_malloc ((64 +2 ) <<PAGE_SHIFT ),0xff , (64 +2 ) <<PAGE_SHIFT ); -memory_region_init_ram_nomigrate (&s->ram,OBJECT (s),"onenand.ram" , +memory_region_init_ram (&s->ram,OBJECT (s),"onenand.ram" ,0xc000 << s->shift, &error_fatal); -vmstate_register_ram_global (&s->ram); ram =memory_region_get_ram_ptr (&s->ram); s->boot[0 ] = ram + (0x0000 << s->shift); s->boot[1 ] = ram + (0x8000 << s->shift);
Signature · 1 line
2.21.1