[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH-for-9.0 07/25] memory: Have memory_region_init_rom() handler retu
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH-for-9.0 07/25] memory: Have memory_region_init_rom() handler return a boolean |
Date: |
Mon, 20 Nov 2023 22:32:41 +0100 |
Following the example documented since commit e3fe3988d7 ("error:
Document Error API usage rules"), have cpu_exec_realizefn()
return a boolean indicating whether an error is set or not.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
include/exec/memory.h | 4 +++-
system/memory.c | 6 ++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/include/exec/memory.h b/include/exec/memory.h
index 788872e4a4..9d9798a527 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -1611,8 +1611,10 @@ bool memory_region_init_ram(MemoryRegion *mr,
* must be unique within any device
* @size: size of the region.
* @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,
const char *name,
uint64_t size,
diff --git a/system/memory.c b/system/memory.c
index 4142eac498..2c764947fa 100644
--- a/system/memory.c
+++ b/system/memory.c
@@ -3620,7 +3620,7 @@ bool memory_region_init_ram(MemoryRegion *mr,
return true;
}
-void memory_region_init_rom(MemoryRegion *mr,
+bool memory_region_init_rom(MemoryRegion *mr,
Object *owner,
const char *name,
uint64_t size,
@@ -3629,7 +3629,7 @@ void memory_region_init_rom(MemoryRegion *mr,
DeviceState *owner_dev;
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.
* We only want the owner here for the purposes of defining a
@@ -3639,6 +3639,8 @@ void memory_region_init_rom(MemoryRegion *mr,
*/
owner_dev = DEVICE(owner);
vmstate_register_ram(mr, owner_dev);
+
+ return true;
}
void memory_region_init_rom_device(MemoryRegion *mr,
--
2.41.0
- Re: [PATCH-for-9.0 04/25] memory: Simplify memory_region_init_rom_nomigrate() calls, (continued)
- [PATCH-for-9.0 05/25] memory: Simplify memory_region_init_ram_from_fd() calls, Philippe Mathieu-Daudé, 2023/11/20
- [PATCH-for-9.0 06/25] memory: Have memory_region_init_ram() handler return a boolean, Philippe Mathieu-Daudé, 2023/11/20
- [PATCH-for-9.0 09/25] memory: Simplify memory_region_init_rom_device_nomigrate() calls, Philippe Mathieu-Daudé, 2023/11/20
- [PATCH-for-9.0 08/25] memory: Have memory_region_init_rom_device_nomigrate() return a boolean, Philippe Mathieu-Daudé, 2023/11/20
- [PATCH-for-9.0 07/25] memory: Have memory_region_init_rom() handler return a boolean,
Philippe Mathieu-Daudé <=
- [PATCH-for-9.0 10/25] memory: Have memory_region_init_rom_device() handler return a boolean, Philippe Mathieu-Daudé, 2023/11/20
- [PATCH-for-9.0 11/25] memory: Have memory_region_init_resizeable_ram() return a boolean, Philippe Mathieu-Daudé, 2023/11/20
- [PATCH-for-9.0 12/25] memory: Have memory_region_init_ram_from_file() handler return a boolean, Philippe Mathieu-Daudé, 2023/11/20
- [PATCH-for-9.0 13/25] memory: Have memory_region_init_ram_from_fd() handler return a boolean, Philippe Mathieu-Daudé, 2023/11/20
- [PATCH-for-9.0 14/25] backends: Use g_autofree in HostMemoryBackendClass::alloc() handlers, Philippe Mathieu-Daudé, 2023/11/20