ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

memory: Have memory_region_init_ram_from_fd() handler return a boolean 

Following the example documented since commit e3fe3988d7 ("error:
Document Error API usage rules"), have memory_region_init_ram_from_fd
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-14-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-11-20 13:46:06 +01:00
parent 9b9d11ac03
commit 9583a90579
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/exec/memory.h
View File

@ -1406,8 +1406,10 @@ bool memory_region_init_ram_from_file(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_fd(MemoryRegion *mr, bool memory_region_init_ram_from_fd(MemoryRegion *mr,
Object *owner, Object *owner,
const char *name, const char *name,
uint64_t size, uint64_t size,

4
system/memory.c
View File

@ -1633,7 +1633,7 @@ bool memory_region_init_ram_from_file(MemoryRegion *mr,
return true; return true;
} }
void memory_region_init_ram_from_fd(MemoryRegion *mr, bool memory_region_init_ram_from_fd(MemoryRegion *mr,
Object *owner, Object *owner,
const char *name, const char *name,
uint64_t size, uint64_t size,
@ -1654,7 +1654,9 @@ void memory_region_init_ram_from_fd(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;
} }
#endif #endif