diff options
| author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2023-11-20 11:30:34 +0100 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <philmd@linaro.org> | 2024-01-05 16:20:15 +0100 |
| commit | ae076b6c39bfd2027e35ca5be922dc8f1b18b901 (patch) | |
| tree | 32bd3ed9ff38db713bd9d5656065e22be6560fbc | |
| parent | b9159451d3411bfef528f431c98527c172cd46e8 (diff) | |
| download | focaccia-qemu-ae076b6c39bfd2027e35ca5be922dc8f1b18b901.tar.gz focaccia-qemu-ae076b6c39bfd2027e35ca5be922dc8f1b18b901.zip | |
memory: Have memory_region_init_rom_device_nomigrate() return a boolean
Following the example documented since commit e3fe3988d7
("error: Document Error API usage rules"), have
memory_region_init_rom_device_nomigrate() 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-9-philmd@linaro.org>
| -rw-r--r-- | include/exec/memory.h | 4 | ||||
| -rw-r--r-- | system/memory.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/exec/memory.h b/include/exec/memory.h index 9f54bc4af8..6d7b49b735 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -1523,8 +1523,10 @@ bool memory_region_init_rom_nomigrate(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_nomigrate(MemoryRegion *mr, +bool memory_region_init_rom_device_nomigrate(MemoryRegion *mr, Object *owner, const MemoryRegionOps *ops, void *opaque, diff --git a/system/memory.c b/system/memory.c index 069aa5ee08..8db271c19e 100644 --- a/system/memory.c +++ b/system/memory.c @@ -1716,7 +1716,7 @@ bool memory_region_init_rom_nomigrate(MemoryRegion *mr, return true; } -void memory_region_init_rom_device_nomigrate(MemoryRegion *mr, +bool memory_region_init_rom_device_nomigrate(MemoryRegion *mr, Object *owner, const MemoryRegionOps *ops, void *opaque, @@ -1737,7 +1737,9 @@ void memory_region_init_rom_device_nomigrate(MemoryRegion *mr, mr->size = int128_zero(); object_unparent(OBJECT(mr)); error_propagate(errp, err); + return false; } + return true; } void memory_region_init_iommu(void *_iommu_mr, |