diff options
| author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2023-11-20 11:24:45 +0100 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <philmd@linaro.org> | 2024-01-05 16:20:15 +0100 |
| commit | cbbc4340232107a85809a7abc37435bead937597 (patch) | |
| tree | d928180dd554791495d03d7a5b3edcb5bf3d0e13 | |
| parent | 1eb64c39d093a20f773e87fd4d0509a33476c707 (diff) | |
| download | qemu-cbbc4340232107a85809a7abc37435bead937597.zip qemu-cbbc4340232107a85809a7abc37435bead937597.tar.gz qemu-cbbc4340232107a85809a7abc37435bead937597.tar.bz2 | |
memory: Have memory_region_init_ram_flags_nomigrate() return a boolean
Following the example documented since commit e3fe3988d7 ("error:
Document Error API usage rules"), have memory_region_init_ram_nomigrate
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: Peter Xu <peterx@redhat.com>
Reviewed-by: Gavin Shan <gshan@redhat.com>
Message-Id: <20231120213301.24349-2-philmd@linaro.org>
| -rw-r--r-- | include/exec/memory.h | 4 | ||||
| -rw-r--r-- | system/memory.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/exec/memory.h b/include/exec/memory.h index f172e82..1df7fb0 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -1310,8 +1310,10 @@ void memory_region_init_ram_nomigrate(MemoryRegion *mr, * * Note that this function does not do anything to cause the data in the * RAM memory region to be migrated; that is the responsibility of the caller. + * + * Return: true on success, else false setting @errp with error. */ -void memory_region_init_ram_flags_nomigrate(MemoryRegion *mr, +bool memory_region_init_ram_flags_nomigrate(MemoryRegion *mr, Object *owner, const char *name, uint64_t size, diff --git a/system/memory.c b/system/memory.c index 798b6c0..6110e85 100644 --- a/system/memory.c +++ b/system/memory.c @@ -1555,7 +1555,7 @@ void memory_region_init_ram_nomigrate(MemoryRegion *mr, memory_region_init_ram_flags_nomigrate(mr, owner, name, size, 0, errp); } -void memory_region_init_ram_flags_nomigrate(MemoryRegion *mr, +bool memory_region_init_ram_flags_nomigrate(MemoryRegion *mr, Object *owner, const char *name, uint64_t size, @@ -1572,7 +1572,9 @@ void memory_region_init_ram_flags_nomigrate(MemoryRegion *mr, mr->size = int128_zero(); object_unparent(OBJECT(mr)); error_propagate(errp, err); + return false; } + return true; } void memory_region_init_resizeable_ram(MemoryRegion *mr, |