| Message ID | 1375785705-6570-1-git-send-email-yzt356@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 2013-08-06 12:41, Arthur Chunqi Li wrote: > Advertise VM_EXIT_SAVE_IA32_PAT and VM_EXIT_LOAD_IA32_PAT. > > Signed-off-by: Arthur Chunqi Li <yzt356@gmail.com> > --- > arch/x86/kvm/vmx.c | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > > diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c > index 396572d..c45adea 100644 > --- a/arch/x86/kvm/vmx.c > +++ b/arch/x86/kvm/vmx.c > @@ -2191,14 +2191,17 @@ static __init void nested_vmx_setup_ctls_msrs(void) > * If bit 55 of VMX_BASIC is off, bits 0-8 and 10, 11, 13, 14, 16 and > * 17 must be 1. > */ > + rdmsr(MSR_IA32_VMX_EXIT_CTLS, > + nested_vmx_exit_ctls_low, nested_vmx_exit_ctls_high); > nested_vmx_exit_ctls_low = VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR; > + nested_vmx_exit_ctls_high &= > + VM_EXIT_LOAD_IA32_PAT | VM_EXIT_SAVE_IA32_PAT; > + nested_vmx_exit_ctls_high |= VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR | > + VM_EXIT_HOST_ADDR_SPACE_SIZE; I would suggest to align the pattern to [1]. Jan [1] http://thread.gmane.org/gmane.comp.emulators.kvm.devel/113629 > /* Note that guest use of VM_EXIT_ACK_INTR_ON_EXIT is not supported. */ > -#ifdef CONFIG_X86_64 > - nested_vmx_exit_ctls_high = VM_EXIT_HOST_ADDR_SPACE_SIZE; > -#else > - nested_vmx_exit_ctls_high = 0; > +#ifndef CONFIG_X86_64 > + nested_vmx_exit_ctls_high &= (~VM_EXIT_HOST_ADDR_SPACE_SIZE); > #endif > - nested_vmx_exit_ctls_high |= VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR; > > /* entry controls */ > rdmsr(MSR_IA32_VMX_ENTRY_CTLS, >
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 396572d..c45adea 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -2191,14 +2191,17 @@ static __init void nested_vmx_setup_ctls_msrs(void) * If bit 55 of VMX_BASIC is off, bits 0-8 and 10, 11, 13, 14, 16 and * 17 must be 1. */ + rdmsr(MSR_IA32_VMX_EXIT_CTLS, + nested_vmx_exit_ctls_low, nested_vmx_exit_ctls_high); nested_vmx_exit_ctls_low = VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR; + nested_vmx_exit_ctls_high &= + VM_EXIT_LOAD_IA32_PAT | VM_EXIT_SAVE_IA32_PAT; + nested_vmx_exit_ctls_high |= VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR | + VM_EXIT_HOST_ADDR_SPACE_SIZE; /* Note that guest use of VM_EXIT_ACK_INTR_ON_EXIT is not supported. */ -#ifdef CONFIG_X86_64 - nested_vmx_exit_ctls_high = VM_EXIT_HOST_ADDR_SPACE_SIZE; -#else - nested_vmx_exit_ctls_high = 0; +#ifndef CONFIG_X86_64 + nested_vmx_exit_ctls_high &= (~VM_EXIT_HOST_ADDR_SPACE_SIZE); #endif - nested_vmx_exit_ctls_high |= VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR; /* entry controls */ rdmsr(MSR_IA32_VMX_ENTRY_CTLS,
Advertise VM_EXIT_SAVE_IA32_PAT and VM_EXIT_LOAD_IA32_PAT. Signed-off-by: Arthur Chunqi Li <yzt356@gmail.com> --- arch/x86/kvm/vmx.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)