[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH] x86/HVM: re-order error path of hvm_domain_initialise()
hvm_destroy_all_ioreq_servers(), called from hvm_domain_relinquish_resources(), invokes relocate_portio_handler(), which uses d->arch.hvm.io_handler. Defer freeing of this array accordingly on the error path of hvm_domain_initialise(). Similarly rtc_deinit() requires d->arch.hvm.pl_time to still be around, or else an armed timer structure would get freed, and that timer never get killed. Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx> --- We may want to consider moving the other two XFREE()s later as well, if only to be on the safe side. For vRTC I question the calling of check_update_timer() from rtc_init(): I would consider it more reasonable to do so immediately before the guest gets first launched, especially if a guest remains paused for a while after creation. --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -714,15 +714,15 @@ int hvm_domain_initialise(struct domain fail1: if ( is_hardware_domain(d) ) xfree(d->arch.hvm.io_bitmap); - XFREE(d->arch.hvm.io_handler); XFREE(d->arch.hvm.params); - XFREE(d->arch.hvm.pl_time); XFREE(d->arch.hvm.irq); fail0: hvm_destroy_cacheattr_region_list(d); destroy_perdomain_mapping(d, PERDOMAIN_VIRT_START, 0); fail: hvm_domain_relinquish_resources(d); + XFREE(d->arch.hvm.io_handler); + XFREE(d->arch.hvm.pl_time); return rc; }
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |