Commit fd1ec772 authored Jul 23, 2018 by Sean Christopherson Committed by Paolo Bonzini Aug 06, 2018

KVM: nVMX: remove a misleading comment regarding vmcs02 fields



prepare_vmcs02() has an odd comment that says certain fields are
"not in vmcs02".  AFAICT the intent of the comment is to document
that various VMCS fields are not handled by prepare_vmcs02(),
e.g. HOST_{FS,GS}_{BASE,SELECTOR}.  While technically true, the
comment is misleading, e.g. it can lead the reader to think that
KVM never writes those fields to vmcs02.

Remove the comment altogether as the handling of FS and GS is
not specific to nested VMX, and GUEST_PML_INDEX has been written
by prepare_vmcs02() since commit "4e59516a (kvm: vmx: ensure
VMCS is current while enabling PML)"

Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 6d6095bd

arch/x86/kvm/vmx.c

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -11741,11 +11741,6 @@ static int prepare_vmcs02(struct kvm_vcpu vcpu, struct vmcs12 vmcs12,
	vmcs_writel(GUEST_ES_BASE, vmcs12->guest_es_base);		vmcs_writel(GUEST_ES_BASE, vmcs12->guest_es_base);
	vmcs_writel(GUEST_CS_BASE, vmcs12->guest_cs_base);		vmcs_writel(GUEST_CS_BASE, vmcs12->guest_cs_base);

	/*
	* Not in vmcs02: GUEST_PML_INDEX, HOST_FS_SELECTOR, HOST_GS_SELECTOR,
	* HOST_FS_BASE, HOST_GS_BASE.
	*/

	if (vmx->nested.nested_run_pending &&		if (vmx->nested.nested_run_pending &&
	(vmcs12->vm_entry_controls & VM_ENTRY_LOAD_DEBUG_CONTROLS)) {		(vmcs12->vm_entry_controls & VM_ENTRY_LOAD_DEBUG_CONTROLS)) {
	kvm_set_dr(vcpu, 7, vmcs12->guest_dr7);		kvm_set_dr(vcpu, 7, vmcs12->guest_dr7);

Admin message