On Fri, Dec 21, 2018 at 11:39:07AM +0100, Miroslav Benes wrote:
> On Thu, 20 Dec 2018, Sean Christopherson wrote:
>
> > Use '%% " _ASM_CX"' instead of '%0' to dereference RCX, i.e. the
> > 'struct vmx_vcpu' pointer, in the VM-Enter asm blobs of vmx_vcpu_run()
>
> It's a nit, but I think it's 'struct vcpu_vmx' pointer. The typo is also
> in the new comments below and in the subject.
Gah, I always manage to switch those two. Looks like Paolo caught the
changelog typo but not the comments.
Paolo, can you fixup the comments, or should I send a proper patch?
>From 20cce9c6f6f8fd12bfc02926a3a736117a06adf4 Mon Sep 17 00:00:00 2001
From: Sean Christopherson <sean.j.christopherson@xxxxxxxxx>
Date: Fri, 21 Dec 2018 10:35:43 -0800
Subject: [PATCH] KVM: VMX: Fix comment typo to reference vcpu_vmx
Signed-off-by: Sean Christopherson <sean.j.christopherson@xxxxxxxxx>
---
arch/x86/kvm/vmx/vmx.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 41d6f7081ff7..f2626c25db2c 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -6482,7 +6482,7 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu)
"mov %c[r14](%%" _ASM_CX "), %%r14 \n\t"
"mov %c[r15](%%" _ASM_CX "), %%r15 \n\t"
#endif
- /* Load guest RCX. This kills the vmx_vcpu pointer! */
+ /* Load guest RCX. This kills the vcpu_vmx pointer! */
"mov %c[rcx](%%" _ASM_CX "), %%" _ASM_CX " \n\t"
/* Enter guest mode */
@@ -6491,7 +6491,7 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu)
/* Save guest's RCX to the stack placeholder (see above) */
"mov %%" _ASM_CX ", %c[wordsize](%%" _ASM_SP ") \n\t"
- /* Load host's RCX, i.e. the vmx_vcpu pointer */
+ /* Load host's RCX, i.e. the vcpu_vmx pointer */
"pop %%" _ASM_CX " \n\t"
/* Set vmx->fail based on EFLAGS.{CF,ZF} */
--
2.19.2
