[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 53/71] memory: Have memory_region_init_rom_device() handler return
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 53/71] memory: Have memory_region_init_rom_device() handler return a boolean |
Date: |
Fri, 5 Jan 2024 16:42:46 +0100 |
Following the example documented since commit e3fe3988d7 ("error:
Document Error API usage rules"), have memory_region_init_rom_device
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-11-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 6d7b49b735..6209458f56 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -1646,8 +1646,10 @@ bool memory_region_init_rom(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_device(MemoryRegion *mr,
+bool memory_region_init_rom_device(MemoryRegion *mr,
Object *owner,
const MemoryRegionOps *ops,
void *opaque,
diff --git a/system/memory.c b/system/memory.c
index c6562f5e86..e5193d4623 100644
--- a/system/memory.c
+++ b/system/memory.c
@@ -3618,7 +3618,7 @@ bool memory_region_init_rom(MemoryRegion *mr,
return true;
}
-void memory_region_init_rom_device(MemoryRegion *mr,
+bool memory_region_init_rom_device(MemoryRegion *mr,
Object *owner,
const MemoryRegionOps *ops,
void *opaque,
@@ -3630,7 +3630,7 @@ void memory_region_init_rom_device(MemoryRegion *mr,
if (!memory_region_init_rom_device_nomigrate(mr, owner, ops, opaque,
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
@@ -3640,6 +3640,8 @@ void memory_region_init_rom_device(MemoryRegion *mr,
*/
owner_dev = DEVICE(owner);
vmstate_register_ram(mr, owner_dev);
+
+ return true;
}
/*
--
2.41.0
- [PULL 42/71] hw/ppc/xive2_regs: Remove unnecessary 'cpu.h' inclusion, (continued)
- [PULL 42/71] hw/ppc/xive2_regs: Remove unnecessary 'cpu.h' inclusion, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 45/71] memory: Have memory_region_init_ram_nomigrate() handler return a boolean, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 43/71] hw/mips: Inline 'bios.h' definitions, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 46/71] memory: Have memory_region_init_rom_nomigrate() handler return a boolean, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 48/71] memory: Simplify memory_region_init_ram_from_fd() calls, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 47/71] memory: Simplify memory_region_init_rom_nomigrate() calls, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 49/71] memory: Have memory_region_init_ram() handler return a boolean, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 50/71] memory: Have memory_region_init_rom() handler return a boolean, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 51/71] memory: Have memory_region_init_rom_device_nomigrate() return a boolean, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 52/71] memory: Simplify memory_region_init_rom_device_nomigrate() calls, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 53/71] memory: Have memory_region_init_rom_device() handler return a boolean,
Philippe Mathieu-Daudé <=
- [PULL 54/71] memory: Have memory_region_init_resizeable_ram() return a boolean, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 55/71] memory: Have memory_region_init_ram_from_file() handler return a boolean, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 56/71] memory: Have memory_region_init_ram_from_fd() handler return a boolean, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 57/71] backends: Use g_autofree in HostMemoryBackendClass::alloc() handlers, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 58/71] backends: Simplify host_memory_backend_memory_complete(), Philippe Mathieu-Daudé, 2024/01/05
- [PULL 60/71] backends: Reduce variable scope in host_memory_backend_memory_complete, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 59/71] backends: Have HostMemoryBackendClass::alloc() handler return a boolean, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 61/71] util/oslib: Have qemu_prealloc_mem() handler return a boolean, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 62/71] misc: Simplify qemu_prealloc_mem() calls, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 63/71] hw: Simplify memory_region_init_ram() calls, Philippe Mathieu-Daudé, 2024/01/05