diff options
| author | Yang Zhang <yang.z.zhang@Intel.com> | 2013-09-30 13:58:48 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2013-09-30 13:58:48 +0200 |
| commit | eb68feea83c9d299c82ef673dd73aa04265292db (patch) | |
| tree | 24fd92ecb118fb00da903e0bf273351c8ae82c55 /xen/arch/x86/hvm/vmx | |
| parent | 1eb47fdc02a9ed1317210d319c1bd4ffc614006a (diff) | |
| download | xen-eb68feea83c9d299c82ef673dd73aa04265292db.tar.gz xen-eb68feea83c9d299c82ef673dd73aa04265292db.tar.bz2 xen-eb68feea83c9d299c82ef673dd73aa04265292db.zip | |
Nested VMX: Expose unrestricted guest feature to guest
With virtual unrestricted guest feature, L2 guest is allowed to run
with PG cleared. Also, allow PAE not set during virtual vmexit emulation.
Signed-off-by: Yang Zhang <yang.z.zhang@Intel.com>
Acked-by: Eddie.Dong@intel.com
Diffstat (limited to 'xen/arch/x86/hvm/vmx')
| -rw-r--r-- | xen/arch/x86/hvm/vmx/vvmx.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index ba617fa9d2..d476f03dcd 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -1342,6 +1342,7 @@ static void virtual_vmexit(struct cpu_user_regs *regs) nestedhvm_vcpu_exit_guestmode(v); nvcpu->nv_vmexit_pending = 0; + nvcpu->nv_vmswitch_in_progress = 1; lm_l2 = !!hvm_long_mode_enabled(v); lm_l1 = !!(__get_vvmcs(nvcpu->nv_vvmcx, VM_EXIT_CONTROLS) & @@ -1372,6 +1373,7 @@ static void virtual_vmexit(struct cpu_user_regs *regs) if ( cpu_has_vmx_virtual_intr_delivery ) nvmx_update_apicv(v); + nvcpu->nv_vmswitch_in_progress = 0; vmreturn(regs, VMSUCCEED); } @@ -1877,6 +1879,7 @@ int nvmx_msr_read_intercept(unsigned int msr, u64 *msr_content) data = SECONDARY_EXEC_DESCRIPTOR_TABLE_EXITING | SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES | SECONDARY_EXEC_ENABLE_VPID | + SECONDARY_EXEC_UNRESTRICTED_GUEST | SECONDARY_EXEC_ENABLE_EPT; data = gen_vmx_msr(data, 0, host_data); break; |