On Sun, Feb 24, 2013 at 02:11:34PM +0100, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kis...@siemens.com>
>
> No need to re-read what vmx_vcpu_run already picked up for us.
>
> Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>
Applied, thanks.
> ---
> arch/x86/kvm/vmx.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index d45f0e0..ccb6456 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -6082,10 +6082,10 @@ static bool nested_vmx_exit_handled_cr(struct
> kvm_vcpu *vcpu,
> */
> static bool nested_vmx_exit_handled(struct kvm_vcpu *vcpu)
> {
> - u32 exit_reason = vmcs_read32(VM_EXIT_REASON);
> u32 intr_info = vmcs_read32(VM_EXIT_INTR_INFO);
> struct vcpu_vmx *vmx = to_vmx(vcpu);
> struct vmcs12 *vmcs12 = get_vmcs12(vcpu);
> + u32 exit_reason = vmx->exit_reason;
>
> if (vmx->nested.nested_run_pending)
> return 0;
> @@ -7364,7 +7364,7 @@ static void prepare_vmcs12(struct kvm_vcpu *vcpu,
> struct vmcs12 *vmcs12)
>
> /* update exit information fields: */
>
> - vmcs12->vm_exit_reason = vmcs_read32(VM_EXIT_REASON);
> + vmcs12->vm_exit_reason = to_vmx(vcpu)->exit_reason;
Well, this can be called after migration, so vcpu->exit_reason will be
incorrect, but we all know how well migration works today with nested
guests.
> vmcs12->exit_qualification = vmcs_readl(EXIT_QUALIFICATION);
>
> vmcs12->vm_exit_intr_info = vmcs_read32(VM_EXIT_INTR_INFO);
> --
> 1.7.3.4
--
Gleb.
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
