motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

memory: Have memory_region_init_ram_from_file() handler return a boolean

Browse source 
Following the example documented since commit e3fe3988d7 ("error:
Document Error API usage rules"), have memory_region_init_ram_from_file
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-13-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-11-20 13:45:13 +01:00
parent f25a9fbb64
commit 9b9d11ac03
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/exec/memory.h
View file

@ -1376,8 +1376,10 @@ bool memory_region_init_resizeable_ram(MemoryRegion *mr,
* *
* Note that this function does not do anything to cause the data in the * 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. * 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_from_file(MemoryRegion *mr, bool memory_region_init_ram_from_file(MemoryRegion *mr,
Object *owner, Object *owner,
const char *name, const char *name,
uint64_t size, uint64_t size,

4
system/memory.c
View file

@ -1605,7 +1605,7 @@ bool memory_region_init_resizeable_ram(MemoryRegion *mr,
} }
#ifdef CONFIG_POSIX #ifdef CONFIG_POSIX
void memory_region_init_ram_from_file(MemoryRegion *mr, bool memory_region_init_ram_from_file(MemoryRegion *mr,
Object *owner, Object *owner,
const char *name, const char *name,
uint64_t size, uint64_t size,
@ -1628,7 +1628,9 @@ void memory_region_init_ram_from_file(MemoryRegion *mr,
mr->size = int128_zero(); mr->size = int128_zero();
object_unparent(OBJECT(mr)); object_unparent(OBJECT(mr));
error_propagate(errp, err); error_propagate(errp, err);
return false;
} }
return true;
} }
void memory_region_init_ram_from_fd(MemoryRegion *mr, void memory_region_init_ram_from_fd(MemoryRegion *mr,