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

Commit 1c696d0e authored by Avi Kivity's avatar Avi Kivity Committed by Marcelo Tosatti
Browse files

KVM: VMX: Simplify saving guest rcx in vmx_vcpu_run 



Change

  push top-of-stack
  pop guest-rcx
  pop dummy

to

  pop guest-rcx

which is the same thing, only simpler.

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 00c25bce

arch/x86/kvm/vmx.c

+2 −2
Original line number Diff line number Diff line
@@ -4066,7 +4066,7 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu) 
		"xchg %0,     (%%"R"sp) \n\t"

		"mov %%"R"ax, %c[rax](%0) \n\t"

		"mov %%"R"bx, %c[rbx](%0) \n\t"

		"push"Q" (%%"R"sp); pop"Q" %c[rcx](%0) \n\t"

		"pop"Q" %c[rcx](%0) \n\t"

		"mov %%"R"dx, %c[rdx](%0) \n\t"

		"mov %%"R"si, %c[rsi](%0) \n\t"

		"mov %%"R"di, %c[rdi](%0) \n\t"
@@ -4084,7 +4084,7 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu) 
		"mov %%cr2, %%"R"ax   \n\t"

		"mov %%"R"ax, %c[cr2](%0) \n\t"



		"pop  %%"R"bp; pop  %%"R"bp; pop  %%"R"dx \n\t"

		"pop  %%"R"bp; pop  %%"R"dx \n\t"

		"setbe %c[fail](%0) \n\t"

	      : : "c"(vmx), "d"((unsigned long)HOST_RSP),

		[launched]"i"(offsetof(struct vcpu_vmx, launched)),