KVM: nVMX: Allow setting the VMXE bit in CR4

Browse source

This patch allows the guest to enable the VMXE bit in CR4, which is a
prerequisite to running VMXON.

Whether to allow setting the VMXE bit now depends on the architecture (svm
or vmx), so its checking has moved to kvm_x86_ops->set_cr4(). This function
now returns an int: If kvm_x86_ops->set_cr4() returns 1, __kvm_set_cr4()
will also return 1, and this will cause kvm_set_cr4() will throw a #GP.

Turning on the VMXE bit is allowed only when the nested VMX feature is
enabled, and turning it off is forbidden after a vmxon.

Signed-off-by: Nadav Har'El <nyh@il.ibm.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

...

This commit is contained in:

Nadav Har'El 2011-05-25 23:03:24 +03:00 • committed by Avi Kivity

parent ec378aeef9

commit 5e1746d620

4 changed files with 22 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

arch/x86/include/asm/kvm_host.h

View file

6

arch/x86/kvm/svm.c

View file

17

arch/x86/kvm/vmx.c

View file

4

arch/x86/kvm/x86.c

View file