From 37aa7a0e2fc8219cbe2bda4b7d074b47a67ac917 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 14 Jan 2016 16:09:39 +0100 Subject: 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 Reviewed-by: Stefano Stabellini Signed-off-by: Stefano Stabellini --- xen-hvm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'xen-hvm.c') diff --git a/xen-hvm.c b/xen-hvm.c index cb7128cca3..a9085a81ac 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -239,9 +239,9 @@ static void xen_ram_init(PCMachineState *pcms, } } -void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr) +void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr, + Error **errp) { - /* FIXME caller ram_block_add() wants error_setg() on failure */ unsigned long nr_pfn; xen_pfn_t *pfn_list; int i; @@ -268,7 +268,8 @@ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr) } if (xc_domain_populate_physmap_exact(xen_xc, xen_domid, nr_pfn, 0, 0, pfn_list)) { - hw_error("xen: failed to populate ram at " RAM_ADDR_FMT, ram_addr); + error_setg(errp, "xen: failed to populate ram at " RAM_ADDR_FMT, + ram_addr); } g_free(pfn_list); -- cgit v1.2.3-55-g7522