26 lines
1.1 KiB
Diff
26 lines
1.1 KiB
Diff
|
# Commit 81caac0cd0f56b0052a7884e6bd99e3a652ddd59
|
||
|
|
# Date 2016-08-29 16:05:31 +0200
|
||
|
|
# Author Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
|
||
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
||
|
|
x86/HVM: add guarding logic for VMX specific code
|
||
|
|
|
||
|
|
The struct hvm_domain.vmx is defined in a union along with the svm.
|
||
|
|
This can causes issue for SVM since this code is used in the common
|
||
|
|
scheduling code for x86. The logic must check for cpu_has_vmx before
|
||
|
|
accessing the hvm_domain.vmx sturcture.
|
||
|
|
|
||
|
|
Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
|
||
|
|
Acked-by: Jan Beulich <jbeulich@suse.com>
|
||
|
|
|
||
|
|
--- a/xen/include/asm-x86/hvm/hvm.h
|
||
|
|
+++ b/xen/include/asm-x86/hvm/hvm.h
|
||
|
|
@@ -611,7 +611,7 @@ unsigned long hvm_cr4_guest_reserved_bit
|
||
|
|
struct vcpu *v_ = (v); \
|
||
|
|
struct domain *d_ = v_->domain; \
|
||
|
|
if ( has_hvm_container_domain(d_) && \
|
||
|
|
- d_->arch.hvm_domain.vmx.vcpu_block ) \
|
||
|
|
+ (cpu_has_vmx && d_->arch.hvm_domain.vmx.vcpu_block) ) \
|
||
|
|
d_->arch.hvm_domain.vmx.vcpu_block(v_); \
|
||
|
|
})
|
||
|
|
|