xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-27 13:30:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge memory_region_init_reservation() into memory_region_init_io()

Browse Source 
Just specifying ops = NULL in some cases can be more convenient than having
two functions.

Signed-off-by: Pavel Fedin <p.fedin@samsung.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 78a379ab1b6b30ab497db7971ad336dad1dbee76.1438758065.git.p.fedin@samsung.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Pavel Fedin 2015-08-13 11:26:21 +01:00 committed by Peter Maydell
parent 68b85290c7
commit 6d6d2abf2c
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/exec/memory.h
View File

@ -437,6 +437,9 @@ void memory_region_init_alias(MemoryRegion *mr,
* memory_region_init_rom_device: Initialize a ROM memory region. Writes are * memory_region_init_rom_device: Initialize a ROM memory region. Writes are
* handled via callbacks. * handled via callbacks.
* *
* If NULL callbacks pointer is given, then I/O space is not supposed to be
* handled by QEMU itself. Any access via the memory API will cause an abort().
*
* @mr: the #MemoryRegion to be initialized. * @mr: the #MemoryRegion to be initialized.
* @owner: the object that tracks the region's reference count * @owner: the object that tracks the region's reference count
* @ops: callbacks for write access handling. * @ops: callbacks for write access handling.
@ -459,16 +462,21 @@ void memory_region_init_rom_device(MemoryRegion *mr,
* A reservation region primariy serves debugging purposes. It claims I/O * A reservation region primariy serves debugging purposes. It claims I/O
* space that is not supposed to be handled by QEMU itself. Any access via * space that is not supposed to be handled by QEMU itself. Any access via
* the memory API will cause an abort(). * the memory API will cause an abort().
* This function is deprecated. Use memory_region_init_io() with NULL
* callbacks instead.
* *
* @mr: the #MemoryRegion to be initialized * @mr: the #MemoryRegion to be initialized
* @owner: the object that tracks the region's reference count * @owner: the object that tracks the region's reference count
* @name: used for debugging; not visible to the user or ABI * @name: used for debugging; not visible to the user or ABI
* @size: size of the region. * @size: size of the region.
*/ */
void memory_region_init_reservation(MemoryRegion *mr, static inline void memory_region_init_reservation(MemoryRegion *mr,
struct Object *owner, Object *owner,
const char *name, const char *name,
uint64_t size); uint64_t size)
{
memory_region_init_io(mr, owner, NULL, mr, name, size);
}
/** /**
* memory_region_init_iommu: Initialize a memory region that translates * memory_region_init_iommu: Initialize a memory region that translates

10
memory.c
View File

@ -1182,7 +1182,7 @@ void memory_region_init_io(MemoryRegion *mr,
uint64_t size) uint64_t size)
{ {
memory_region_init(mr, owner, name, size); memory_region_init(mr, owner, name, size);
mr->ops = ops; mr->ops = ops ? ops : &unassigned_mem_ops;
mr->opaque = opaque; mr->opaque = opaque;
mr->terminates = true; mr->terminates = true;
} }
@ -1300,14 +1300,6 @@ void memory_region_init_iommu(MemoryRegion *mr,
notifier_list_init(&mr->iommu_notify); notifier_list_init(&mr->iommu_notify);
} }
void memory_region_init_reservation(MemoryRegion *mr,
Object *owner,
const char *name,
uint64_t size)
{
memory_region_init_io(mr, owner, &unassigned_mem_ops, mr, name, size);
}
static void memory_region_finalize(Object *obj) static void memory_region_finalize(Object *obj)
{ {
MemoryRegion *mr = MEMORY_REGION(obj); MemoryRegion *mr = MEMORY_REGION(obj);