Browse files

sys/x86/xen/hvm.c:

	Set cpu_ops correctly for Xen hypervisors lacking the
	vector callback feature.

	Set preliminary Xen cpu_ops settings during early HVM
	initialization.  The old location raced with the startup
	of APs.

Submitted by:	Roger Pau Monné
Reviewed by:	gibbs
Approved by:	re (blanket Xen)
  • Loading branch information...
1 parent b218938 commit 7355b035d609952dd56a4ded2ef48a3340f38c33 gibbs committed Sep 27, 2013
Showing with 3 additions and 2 deletions.
  1. +3 −2 sys/x86/xen/hvm.c
View
5 sys/x86/xen/hvm.c
@@ -117,7 +117,7 @@ struct xen_ipi_handler
enum xen_domain_type xen_domain_type = XEN_NATIVE;
struct cpu_ops xen_hvm_cpu_ops = {
- .ipi_vectored = xen_ipi_vectored,
+ .ipi_vectored = lapic_ipi_vectored,
.cpu_init = xen_hvm_cpu_init,
.cpu_resume = xen_hvm_cpu_resume
};
@@ -535,7 +535,7 @@ xen_setup_cpus(void)
xen_cpu_ipi_init(i);
/* Set the xen pv ipi ops to replace the native ones */
- cpu_ops = xen_hvm_cpu_ops;
+ cpu_ops.ipi_vectored = xen_ipi_vectored;
}
#endif
@@ -699,6 +699,7 @@ xen_hvm_init(enum xen_hvm_init_type init_type)
return;
setup_xen_features();
+ cpu_ops = xen_hvm_cpu_ops;
break;
case XEN_HVM_INIT_RESUME:
if (error != 0)

0 comments on commit 7355b03

Please sign in to comment.