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

Commit 73ede8d3 authored by Alexander Graf's avatar Alexander Graf Committed by Avi Kivity
Browse files

KVM: PPC: bookehv: fix exit timing 



When using exit timing stats, we clobber r9 in the NEED_EMU case,
so better move that part down a few lines and fix it that way.

Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 8b3a00fc

arch/powerpc/kvm/bookehv_interrupts.S

+4 −4
Original line number Original line Diff line number Diff line
@@ -83,10 +83,6 @@ 
	stw	r10, VCPU_GUEST_PID(r4)

	stw	r10, VCPU_GUEST_PID(r4)

	mtspr	SPRN_PID, r8

	mtspr	SPRN_PID, r8





	.if	\flags & NEED_EMU

	lwz	r9, VCPU_KVM(r4)

	.endif



#ifdef CONFIG_KVM_EXIT_TIMING

#ifdef CONFIG_KVM_EXIT_TIMING

	/* save exit time */

	/* save exit time */

1:	mfspr	r7, SPRN_TBRU

1:	mfspr	r7, SPRN_TBRU
@@ -98,6 +94,10 @@ 
	PPC_STL	r9, VCPU_TIMING_EXIT_TBU(r4)

	PPC_STL	r9, VCPU_TIMING_EXIT_TBU(r4)

#endif

#endif





	.if	\flags & NEED_EMU

	lwz	r9, VCPU_KVM(r4)

	.endif



	oris	r8, r6, MSR_CE@h

	oris	r8, r6, MSR_CE@h

#ifndef CONFIG_64BIT

#ifndef CONFIG_64BIT

	stw	r6, (VCPU_SHARED_MSR + 4)(r11)

	stw	r6, (VCPU_SHARED_MSR + 4)(r11)