Skip to content

Commit

Permalink
memory: Have memory_region_init_ram() handler return a boolean
Browse files Browse the repository at this point in the history
Following the example documented since commit e3fe398 ("error:
Document Error API usage rules"), have memory_region_init_ram()
return a boolean indicating whether an error is set or not.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Gavin Shan <gshan@redhat.com>
Message-Id: <20231120213301.24349-7-philmd@linaro.org>
  • Loading branch information
philmd committed Jan 5, 2024
1 parent d3143bd commit fe5f33d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 3 additions & 1 deletion include/exec/memory.h
Original file line number Diff line number Diff line change
Expand Up @@ -1582,8 +1582,10 @@ void memory_region_init_iommu(void *_iommu_mr,
* give the RAM block a unique name for migration purposes.
* We should lift this restriction and allow arbitrary Objects.
* If you pass a non-NULL non-device @owner then we will assert.
*
* Return: true on success, else false setting @errp with error.
*/
void memory_region_init_ram(MemoryRegion *mr,
bool memory_region_init_ram(MemoryRegion *mr,
Object *owner,
const char *name,
uint64_t size,
Expand Down
6 changes: 4 additions & 2 deletions system/memory.c
Original file line number Diff line number Diff line change
Expand Up @@ -3570,7 +3570,7 @@ void mtree_info(bool flatview, bool dispatch_tree, bool owner, bool disabled)
}
}

void memory_region_init_ram(MemoryRegion *mr,
bool memory_region_init_ram(MemoryRegion *mr,
Object *owner,
const char *name,
uint64_t size,
Expand All @@ -3579,7 +3579,7 @@ void memory_region_init_ram(MemoryRegion *mr,
DeviceState *owner_dev;

if (!memory_region_init_ram_nomigrate(mr, owner, name, size, errp)) {
return;
return false;
}
/* This will assert if owner is neither NULL nor a DeviceState.
* We only want the owner here for the purposes of defining a
Expand All @@ -3589,6 +3589,8 @@ void memory_region_init_ram(MemoryRegion *mr,
*/
owner_dev = DEVICE(owner);
vmstate_register_ram(mr, owner_dev);

return true;
}

void memory_region_init_rom(MemoryRegion *mr,
Expand Down

0 comments on commit fe5f33d

Please sign in to comment.