diff options
| author | Paolo Bonzini | 2014-05-14 11:43:20 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin | 2014-06-19 17:44:20 +0200 |
| commit | 7f56e740a68c9f4ccebf7ad7590e82fbb30ffc87 (patch) | |
| tree | cb8e9a6884921dcf55caf139884f34d2f4f93424 /include/exec/ram_addr.h | |
| parent | memory: move mem_path handling to memory_region_allocate_system_memory (diff) | |
| download | qemu-7f56e740a68c9f4ccebf7ad7590e82fbb30ffc87.tar.gz qemu-7f56e740a68c9f4ccebf7ad7590e82fbb30ffc87.tar.xz qemu-7f56e740a68c9f4ccebf7ad7590e82fbb30ffc87.zip | |
memory: add error propagation to file-based RAM allocation
Right now, -mem-path will fall back to RAM-based allocation in some
cases. This should never happen with "-object memory-file", prepare
the code by adding correct error propagation.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
MST: drop \n at end of error messages
Diffstat (limited to 'include/exec/ram_addr.h')
| -rw-r--r-- | include/exec/ram_addr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index 9b00638505..deafcebac0 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -23,7 +23,7 @@ #include "hw/xen/xen.h" ram_addr_t qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr, - const char *mem_path); + const char *mem_path, Error **errp); ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host, MemoryRegion *mr); ram_addr_t qemu_ram_alloc(ram_addr_t size, MemoryRegion *mr); |