Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0658fbaa authored by Arthur Chunqi Li's avatar Arthur Chunqi Li Committed by Paolo Bonzini
Browse files

KVM: nVMX: Change location of 3 functions in vmx.c 



Move nested_vmx_succeed/nested_vmx_failInvalid/nested_vmx_failValid
ahead of handle_vmon to eliminate double declaration in the same
file

Signed-off-by: default avatarArthur Chunqi Li <yzt356@gmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent e6dff7d1

arch/x86/kvm/vmx.c

+40 −43
Original line number Diff line number Diff line
@@ -5567,8 +5567,47 @@ static void nested_free_all_saved_vmcss(struct vcpu_vmx *vmx) 
		free_loaded_vmcs(&vmx->vmcs01);

}



/*

 * The following 3 functions, nested_vmx_succeed()/failValid()/failInvalid(),

 * set the success or error code of an emulated VMX instruction, as specified

 * by Vol 2B, VMX Instruction Reference, "Conventions".

 */

static void nested_vmx_succeed(struct kvm_vcpu *vcpu)

{

	vmx_set_rflags(vcpu, vmx_get_rflags(vcpu)

			& ~(X86_EFLAGS_CF | X86_EFLAGS_PF | X86_EFLAGS_AF |

			    X86_EFLAGS_ZF | X86_EFLAGS_SF | X86_EFLAGS_OF));

}



static void nested_vmx_failInvalid(struct kvm_vcpu *vcpu)

{

	vmx_set_rflags(vcpu, (vmx_get_rflags(vcpu)

			& ~(X86_EFLAGS_PF | X86_EFLAGS_AF | X86_EFLAGS_ZF |

			    X86_EFLAGS_SF | X86_EFLAGS_OF))

			| X86_EFLAGS_CF);

}



static void nested_vmx_failValid(struct kvm_vcpu *vcpu,

				 u32 vm_instruction_error);

					u32 vm_instruction_error)

{

	if (to_vmx(vcpu)->nested.current_vmptr == -1ull) {

		/*

		 * failValid writes the error number to the current VMCS, which

		 * can't be done there isn't a current VMCS.

		 */

		nested_vmx_failInvalid(vcpu);

		return;

	}

	vmx_set_rflags(vcpu, (vmx_get_rflags(vcpu)

			& ~(X86_EFLAGS_CF | X86_EFLAGS_PF | X86_EFLAGS_AF |

			    X86_EFLAGS_SF | X86_EFLAGS_OF))

			| X86_EFLAGS_ZF);

	get_vmcs12(vcpu)->vm_instruction_error = vm_instruction_error;

	/*

	 * We don't need to force a shadow sync because

	 * VM_INSTRUCTION_ERROR is not shadowed

	 */

}



/*

 * Emulate the VMXON instruction.
@@ -5768,48 +5807,6 @@ static int get_vmx_mem_address(struct kvm_vcpu *vcpu, 
	return 0;

}



/*

 * The following 3 functions, nested_vmx_succeed()/failValid()/failInvalid(),

 * set the success or error code of an emulated VMX instruction, as specified

 * by Vol 2B, VMX Instruction Reference, "Conventions".

 */

static void nested_vmx_succeed(struct kvm_vcpu *vcpu)

{

	vmx_set_rflags(vcpu, vmx_get_rflags(vcpu)

			& ~(X86_EFLAGS_CF | X86_EFLAGS_PF | X86_EFLAGS_AF |

			    X86_EFLAGS_ZF | X86_EFLAGS_SF | X86_EFLAGS_OF));

}



static void nested_vmx_failInvalid(struct kvm_vcpu *vcpu)

{

	vmx_set_rflags(vcpu, (vmx_get_rflags(vcpu)

			& ~(X86_EFLAGS_PF | X86_EFLAGS_AF | X86_EFLAGS_ZF |

			    X86_EFLAGS_SF | X86_EFLAGS_OF))

			| X86_EFLAGS_CF);

}



static void nested_vmx_failValid(struct kvm_vcpu *vcpu,

					u32 vm_instruction_error)

{

	if (to_vmx(vcpu)->nested.current_vmptr == -1ull) {

		/*

		 * failValid writes the error number to the current VMCS, which

		 * can't be done there isn't a current VMCS.

		 */

		nested_vmx_failInvalid(vcpu);

		return;

	}

	vmx_set_rflags(vcpu, (vmx_get_rflags(vcpu)

			& ~(X86_EFLAGS_CF | X86_EFLAGS_PF | X86_EFLAGS_AF |

			    X86_EFLAGS_SF | X86_EFLAGS_OF))

			| X86_EFLAGS_ZF);

	get_vmcs12(vcpu)->vm_instruction_error = vm_instruction_error;

	/*

	 * We don't need to force a shadow sync because

	 * VM_INSTRUCTION_ERROR is not shadowed

	 */

}



/* Emulate the VMCLEAR instruction */

static int handle_vmclear(struct kvm_vcpu *vcpu)

{