mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

memory: Have memory_region_init_rom() handler return a boolean

Browse Source 
Following the example documented since commit e3fe3988d7 ("error:
Document Error API usage rules"), have memory_region_init_rom()
return a boolean indicating whether an error is set or not.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Reviewed-by: Gavin Shan <gshan@redhat.com>
Message-Id: <20231120213301.24349-8-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-11-20 11:29:31 +01:00
parent fe5f33d6b0
commit b9159451d3
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/exec/memory.h
View File

@ -1611,8 +1611,10 @@ bool memory_region_init_ram(MemoryRegion *mr,
* must be unique within any device * must be unique within any device
* @size: size of the region. * @size: size of the region.
* @errp: pointer to Error*, to store an error if it happens. * @errp: pointer to Error*, to store an error if it happens.
*
* Return: true on success, else false setting @errp with error.
*/ */
void memory_region_init_rom(MemoryRegion *mr, bool memory_region_init_rom(MemoryRegion *mr,
Object *owner, Object *owner,
const char *name, const char *name,
uint64_t size, uint64_t size,

6
system/memory.c
View File

@ -3593,7 +3593,7 @@ bool memory_region_init_ram(MemoryRegion *mr,
return true; return true;
} }
void memory_region_init_rom(MemoryRegion *mr, bool memory_region_init_rom(MemoryRegion *mr,
Object *owner, Object *owner,
const char *name, const char *name,
uint64_t size, uint64_t size,
@ -3602,7 +3602,7 @@ void memory_region_init_rom(MemoryRegion *mr,
DeviceState *owner_dev; DeviceState *owner_dev;
if (!memory_region_init_rom_nomigrate(mr, owner, name, size, errp)) { if (!memory_region_init_rom_nomigrate(mr, owner, name, size, errp)) {
return; return false;
} }
/* This will assert if owner is neither NULL nor a DeviceState. /* This will assert if owner is neither NULL nor a DeviceState.
* We only want the owner here for the purposes of defining a * We only want the owner here for the purposes of defining a
@ -3612,6 +3612,8 @@ void memory_region_init_rom(MemoryRegion *mr,
*/ */
owner_dev = DEVICE(owner); owner_dev = DEVICE(owner);
vmstate_register_ram(mr, owner_dev); vmstate_register_ram(mr, owner_dev);
return true;
} }
void memory_region_init_rom_device(MemoryRegion *mr, void memory_region_init_rom_device(MemoryRegion *mr,