diff options
| author | Yang Zhang <yang.z.zhang@Intel.com> | 2013-08-27 15:29:08 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2013-08-27 15:29:08 +0200 |
| commit | 190f5348b77000960ea8e8c8728e65184d1eebf4 (patch) | |
| tree | 80b9bafa32ddd493c0f9a25f7ac71e5fde9d89ce | |
| parent | 863b772fd95228938fbf80e311779045230ccfd4 (diff) | |
| download | xen-190f5348b77000960ea8e8c8728e65184d1eebf4.tar.gz xen-190f5348b77000960ea8e8c8728e65184d1eebf4.tar.bz2 xen-190f5348b77000960ea8e8c8728e65184d1eebf4.zip | |
Nested VMX: Clear APIC-v control bit in vmcs02
There is no vAPIC-v support, so mask APIC-v control bit when
constructing vmcs02.
Signed-off-by: Yang Zhang <yang.z.zhang@Intel.com>
Acked-by: "Dong, Eddie" <eddie.dong@intel.com>
master commit: 375a1035002fb257087756a86e6caeda649fc0f1
master date: 2013-08-22 10:52:05 +0200
| -rw-r--r-- | xen/arch/x86/hvm/vmx/vvmx.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 5dfbc54d94..0dc567a972 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -613,8 +613,15 @@ void nvmx_update_secondary_exec_control(struct vcpu *v, u32 shadow_cntrl; struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); struct nestedvmx *nvmx = &vcpu_2_nvmx(v); + u32 apicv_bit = SECONDARY_EXEC_APIC_REGISTER_VIRT | + SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY; + host_cntrl &= ~apicv_bit; shadow_cntrl = __get_vvmcs(nvcpu->nv_vvmcx, SECONDARY_VM_EXEC_CONTROL); + + /* No vAPIC-v support, so it shouldn't be set in vmcs12. */ + ASSERT(!(shadow_cntrl & apicv_bit)); + nvmx->ept.enabled = !!(shadow_cntrl & SECONDARY_EXEC_ENABLE_EPT); shadow_cntrl |= host_cntrl; __vmwrite(SECONDARY_VM_EXEC_CONTROL, shadow_cntrl); @@ -625,7 +632,12 @@ static void nvmx_update_pin_control(struct vcpu *v, unsigned long host_cntrl) u32 shadow_cntrl; struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); + host_cntrl &= ~PIN_BASED_POSTED_INTERRUPT; shadow_cntrl = __get_vvmcs(nvcpu->nv_vvmcx, PIN_BASED_VM_EXEC_CONTROL); + + /* No vAPIC-v support, so it shouldn't be set in vmcs12. */ + ASSERT(!(shadow_cntrl & PIN_BASED_POSTED_INTERRUPT)); + shadow_cntrl |= host_cntrl; __vmwrite(PIN_BASED_VM_EXEC_CONTROL, shadow_cntrl); } |