mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-09 18:44:58 -06:00
memory: add parameter errp to memory_region_init_ram
Add parameter errp to memory_region_init_ram and update all call sites to pass in &error_abort. Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
ef701d7b6f
commit
49946538d2
75 changed files with 210 additions and 135 deletions
|
@ -99,11 +99,12 @@ petalogix_ml605_init(MachineState *machine)
|
|||
|
||||
/* Attach emulated BRAM through the LMB. */
|
||||
memory_region_init_ram(phys_lmb_bram, NULL, "petalogix_ml605.lmb_bram",
|
||||
LMB_BRAM_SIZE);
|
||||
LMB_BRAM_SIZE, &error_abort);
|
||||
vmstate_register_ram_global(phys_lmb_bram);
|
||||
memory_region_add_subregion(address_space_mem, 0x00000000, phys_lmb_bram);
|
||||
|
||||
memory_region_init_ram(phys_ram, NULL, "petalogix_ml605.ram", ram_size);
|
||||
memory_region_init_ram(phys_ram, NULL, "petalogix_ml605.ram", ram_size,
|
||||
&error_abort);
|
||||
vmstate_register_ram_global(phys_ram);
|
||||
memory_region_add_subregion(address_space_mem, MEMORY_BASEADDR, phys_ram);
|
||||
|
||||
|
|
|
@ -81,11 +81,13 @@ petalogix_s3adsp1800_init(MachineState *machine)
|
|||
|
||||
/* Attach emulated BRAM through the LMB. */
|
||||
memory_region_init_ram(phys_lmb_bram, NULL,
|
||||
"petalogix_s3adsp1800.lmb_bram", LMB_BRAM_SIZE);
|
||||
"petalogix_s3adsp1800.lmb_bram", LMB_BRAM_SIZE,
|
||||
&error_abort);
|
||||
vmstate_register_ram_global(phys_lmb_bram);
|
||||
memory_region_add_subregion(sysmem, 0x00000000, phys_lmb_bram);
|
||||
|
||||
memory_region_init_ram(phys_ram, NULL, "petalogix_s3adsp1800.ram", ram_size);
|
||||
memory_region_init_ram(phys_ram, NULL, "petalogix_s3adsp1800.ram",
|
||||
ram_size, &error_abort);
|
||||
vmstate_register_ram_global(phys_ram);
|
||||
memory_region_add_subregion(sysmem, ddr_base, phys_ram);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue