On 20.07.2018 23:42, Peter Shier wrote: > From: Jim Mattson <jmattson@xxxxxxxxxx> > > VMRESUME is much more common than VMLAUNCH, so put VMRESUME on the > fall-through path. > > Signed-off-by: Jim Mattson <jmattson@xxxxxxxxxx> > Signed-off-by: Peter Shier <pshier@xxxxxxxxxx> > --- > arch/x86/kvm/vmx.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c > index 1689f433f3a08..33c5ec426206a 100644 > --- a/arch/x86/kvm/vmx.c > +++ b/arch/x86/kvm/vmx.c > @@ -10064,10 +10064,10 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu) > "mov %c[rcx](%0), %%" _ASM_CX " \n\t" /* kills %0 (ecx) */ > > /* Enter guest mode */ > - "jne 1f \n\t" > - __ex(ASM_VMX_VMLAUNCH) "\n\t" > + "je 1f\n\t" > + __ex(ASM_VMX_VMRESUME) "\n\t" > "jmp 2f \n\t" > - "1: " __ex(ASM_VMX_VMRESUME) "\n\t" > + "1: " __ex(ASM_VMX_VMLAUNCH) "\n\t" > "2: " > /* Save guest registers, load host registers, keep flags */ > "mov %0, %c[wordsize](%%" _ASM_SP ") \n\t" > Reviewed-by: David Hildenbrand <david@xxxxxxxxxx> -- Thanks, David / dhildenb
