summary refs log tree commit diff stats
path: root/include/exec/memory.h
diff options
context:
space:
mode:
authorHu Tao <hutao@cn.fujitsu.com>2014-09-09 13:27:57 +0800
committerPaolo Bonzini <pbonzini@redhat.com>2014-09-09 13:41:44 +0200
commit33e0eb5297883444f784a7c22bcf30550a30d601 (patch)
treee7d8d30ba00aae966a66e1ccee39e2822176723b /include/exec/memory.h
parent49946538d29618319a54e798f22bbcc8065ad106 (diff)
downloadfocaccia-qemu-33e0eb5297883444f784a7c22bcf30550a30d601.tar.gz
focaccia-qemu-33e0eb5297883444f784a7c22bcf30550a30d601.zip
memory: add parameter errp to memory_region_init_rom_device
Add parameter errp to memory_region_init_rom_device and update all call
sites to propagate the error.

Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
[Propagate the error out of realize. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include/exec/memory.h')
-rw-r--r--include/exec/memory.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/exec/memory.h b/include/exec/memory.h
index fd4131b5f6..072aad2239 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -386,13 +386,15 @@ void memory_region_init_alias(MemoryRegion *mr,
  * @ops: callbacks for write access handling.
  * @name: the name of the region.
  * @size: size of the region.
+ * @errp: pointer to Error*, to store an error if it happens.
  */
 void memory_region_init_rom_device(MemoryRegion *mr,
                                    struct Object *owner,
                                    const MemoryRegionOps *ops,
                                    void *opaque,
                                    const char *name,
-                                   uint64_t size);
+                                   uint64_t size,
+                                   Error **errp);
 
 /**
  * memory_region_init_reservation: Initialize a memory region that reserves