mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
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@suse.com> Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
This commit is contained in:
1 parent
3c9fd69416
commit
fbb3bf002b
1 file changed
+2
-2
@@ -714,15 +714,15 @@ int hvm_domain_initialise(struct domain *d)
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||