[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 49/71] memory: Have memory_region_init_ram() handler return a bool
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 49/71] memory: Have memory_region_init_ram() handler return a boolean |
Date: |
Fri, 5 Jan 2024 16:42:42 +0100 |
Following the example documented since commit e3fe3988d7 ("error:
Document Error API usage rules"), have memory_region_init_ram()
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-7-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 f3a4a76817..b2dce73e7f 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -1582,8 +1582,10 @@ void memory_region_init_iommu(void *_iommu_mr,
* give the RAM block a unique name for migration purposes.
* We should lift this restriction and allow arbitrary Objects.
* If you pass a non-NULL non-device @owner then we will assert.
+ *
+ * Return: true on success, else false setting @errp with error.
*/
-void memory_region_init_ram(MemoryRegion *mr,
+bool memory_region_init_ram(MemoryRegion *mr,
Object *owner,
const char *name,
uint64_t size,
diff --git a/system/memory.c b/system/memory.c
index c1374e9968..45ce6fd6c1 100644
--- a/system/memory.c
+++ b/system/memory.c
@@ -3570,7 +3570,7 @@ void mtree_info(bool flatview, bool dispatch_tree, bool
owner, bool disabled)
}
}
-void memory_region_init_ram(MemoryRegion *mr,
+bool memory_region_init_ram(MemoryRegion *mr,
Object *owner,
const char *name,
uint64_t size,
@@ -3579,7 +3579,7 @@ void memory_region_init_ram(MemoryRegion *mr,
DeviceState *owner_dev;
if (!memory_region_init_ram_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
@@ -3589,6 +3589,8 @@ void memory_region_init_ram(MemoryRegion *mr,
*/
owner_dev = DEVICE(owner);
vmstate_register_ram(mr, owner_dev);
+
+ return true;
}
void memory_region_init_rom(MemoryRegion *mr,
--
2.41.0
- [PULL 38/71] hw/arm/bcm2836: Simplify use of 'reset-cbar' property, (continued)
- [PULL 38/71] hw/arm/bcm2836: Simplify use of 'reset-cbar' property, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 43/71] hw/mips: Inline 'bios.h' definitions, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 40/71] hw/ppc/spapr_cpu_core: Access QDev properties with proper API, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 41/71] hw: Simplify accesses to the CPUState::'start-powered-off' property, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 44/71] memory: Have memory_region_init_ram_flags_nomigrate() return a boolean, Philippe Mathieu-Daudé, 2024/01/05
- [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 48/71] memory: Simplify memory_region_init_ram_from_fd() calls, 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 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é <=
- [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é, 2024/01/05
- [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 59/71] backends: Have HostMemoryBackendClass::alloc() handler return a boolean, Philippe Mathieu-Daudé, 2024/01/05