diff options
| author | Markus Armbruster <armbru@redhat.com> | 2016-01-14 16:09:39 +0100 |
|---|---|---|
| committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2016-01-14 16:49:50 +0000 |
| commit | 37aa7a0e2fc8219cbe2bda4b7d074b47a67ac917 (patch) | |
| tree | 4891802a2840d852539c9b7170b3798bd1aaf323 /include/hw/xen/xen.h | |
| parent | dced4d2fcb3961358b12ec3a191dd04505f333af (diff) | |
| download | focaccia-qemu-37aa7a0e2fc8219cbe2bda4b7d074b47a67ac917.tar.gz focaccia-qemu-37aa7a0e2fc8219cbe2bda4b7d074b47a67ac917.zip | |
xen-hvm: Clean up xen_ram_alloc() error handling
xen_ram_alloc() dies with hw_error() on error, even though its caller ram_block_add() handles errors just fine. Add an Error **errp parameter and use it. Leave case RUN_STATE_INMIGRATE alone, because that looks like some kind of warning. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Diffstat (limited to 'include/hw/xen/xen.h')
| -rw-r--r-- | include/hw/xen/xen.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h index d07bc993ec..1b81b4be9a 100644 --- a/include/hw/xen/xen.h +++ b/include/hw/xen/xen.h @@ -41,7 +41,7 @@ void xenstore_store_pv_console_info(int i, struct CharDriverState *chr); #if defined(NEED_CPU_H) && !defined(CONFIG_USER_ONLY) void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory); void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, - struct MemoryRegion *mr); + struct MemoryRegion *mr, Error **errp); void xen_modified_memory(ram_addr_t start, ram_addr_t length); #endif |