diff options
| author | Markus Armbruster <armbru@redhat.com> | 2016-01-14 16:09:38 +0100 |
|---|---|---|
| committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2016-01-14 16:49:36 +0000 |
| commit | dced4d2fcb3961358b12ec3a191dd04505f333af (patch) | |
| tree | 85a02abd9ffb53d62da35dce15621f632fa1b3f9 /include/hw/xen/xen.h | |
| parent | ac0487e1d2ae811cd4d035741a109a4ecfb013f1 (diff) | |
| download | focaccia-qemu-dced4d2fcb3961358b12ec3a191dd04505f333af.tar.gz focaccia-qemu-dced4d2fcb3961358b12ec3a191dd04505f333af.zip | |
xen-hvm: Clean up xen_hvm_init() error handling
xen_hvm_init() returns -1 without cleaning up on some errors (harmless long as the caller exit()s on error), dies with hw_error() on others. hw_error() isn't approprate here. Clean up to exit() on all errors. 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 e90931a508..d07bc993ec 100644 --- a/include/hw/xen/xen.h +++ b/include/hw/xen/xen.h @@ -39,7 +39,7 @@ qemu_irq *xen_interrupt_controller_init(void); void xenstore_store_pv_console_info(int i, struct CharDriverState *chr); #if defined(NEED_CPU_H) && !defined(CONFIG_USER_ONLY) -int xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory); +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); void xen_modified_memory(ram_addr_t start, ram_addr_t length); |