From: Boris Ostrovsky Date: Tue, 5 Apr 2016 11:25:13 +0000 (+0200) Subject: x86/pvh: initialize ioreq server for PVH guests X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~1386 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e43b27a5999befcb6948622938253afc4345968b;p=xen.git x86/pvh: initialize ioreq server for PVH guests ioreq server list needs to be initialized for PVH guests. This list is walked in handle_hvm_io_completion() by all guests in HVM containers and leaving it uninitialized may cause PVH guests to crash there. Signed-off-by: Boris Ostrovsky Reviewed-by: Jan Beulich --- diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index ad14eb35dd..b239f74831 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -621,6 +621,8 @@ int hvm_domain_initialise(struct domain *d) register_dpci_portio_handler(d); + hvm_ioreq_init(d); + if ( is_pvh_domain(d) ) { register_portio_handler(d, 0, 0x10003, handle_pvh_io); @@ -645,8 +647,6 @@ int hvm_domain_initialise(struct domain *d) register_portio_handler(d, 0xe9, 1, hvm_print_line); - hvm_ioreq_init(d); - if ( hvm_tsc_scaling_supported ) d->arch.hvm_domain.tsc_scaling_ratio = hvm_default_tsc_scaling_ratio; diff --git a/xen/arch/x86/hvm/ioreq.c b/xen/arch/x86/hvm/ioreq.c index e640eff45d..690e4781c0 100644 --- a/xen/arch/x86/hvm/ioreq.c +++ b/xen/arch/x86/hvm/ioreq.c @@ -1361,7 +1361,8 @@ void hvm_ioreq_init(struct domain *d) spin_lock_init(&d->arch.hvm_domain.ioreq_server.lock); INIT_LIST_HEAD(&d->arch.hvm_domain.ioreq_server.list); - register_portio_handler(d, 0xcf8, 4, hvm_access_cf8); + if ( !is_pvh_domain(d) ) + register_portio_handler(d, 0xcf8, 4, hvm_access_cf8); } /*