diff options
| author | Justin T. Gibbs <gibbs@FreeBSD.org> | 2013-10-05 19:51:09 +0000 |
|---|---|---|
| committer | Justin T. Gibbs <gibbs@FreeBSD.org> | 2013-10-05 19:51:09 +0000 |
| commit | bf57e9793acf2560ddf629569f2685fee01d1446 (patch) | |
| tree | 9e10b27ab32e89b88eed965f2e5b47be7f6f9610 /sys/x86 | |
| parent | 5b9d734b08304416a4f340b9a436360fb6e08745 (diff) | |
| download | src-bf57e9793acf2560ddf629569f2685fee01d1446.tar.gz src-bf57e9793acf2560ddf629569f2685fee01d1446.zip | |
Correct panic caused by attaching both Xen PV and HyperV virtualization
aware drivers on Xen hypervisors that advertise support for some
HyperV features.
x86/xen/hvm.c:
When running in HVM mode on a Xen hypervisor, set vm_guest
to VM_GUEST_XEN so other virtualization aware components in
the FreeBSD kernel can detect this mode is active.
dev/hyperv/vmbus/hv_hv.c:
Use vm_guest to ignore Xen's HyperV emulation when Xen is
detected and Xen PV drivers are active.
Reported by: Shanker Balan
Submitted by: Roger Pau Monné
Sponsored by: Citrix Systems R&D
Reviewed by: gibbs
Approved by: re (Xen blanket)
Notes
Notes:
svn path=/head/; revision=256071
Diffstat (limited to 'sys/x86')
| -rw-r--r-- | sys/x86/xen/hvm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/x86/xen/hvm.c b/sys/x86/xen/hvm.c index bb7bb5b3c288..510b8b9a9e7c 100644 --- a/sys/x86/xen/hvm.c +++ b/sys/x86/xen/hvm.c @@ -700,6 +700,7 @@ xen_hvm_init(enum xen_hvm_init_type init_type) setup_xen_features(); cpu_ops = xen_hvm_cpu_ops; + vm_guest = VM_GUEST_XEN; break; case XEN_HVM_INIT_RESUME: if (error != 0) |