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

Commit fcfdbd26 authored by Hollis Blanchard's avatar Hollis Blanchard Committed by Avi Kivity
Browse files

KVM: ppc: improve trap emulation 



set ESR[PTR] when emulating a guest trap. This allows Linux guests to
properly handle WARN_ON() (i.e. detect that it's a non-fatal trap).

Also remove debugging printk in trap emulation.

Signed-off-by: default avatarHollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent d4cf3892

arch/powerpc/kvm/emulate.c

+2 −2
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu) 


	switch (get_op(inst)) {

	case 3:                                             /* trap */

		printk("trap!\n");

		vcpu->arch.esr |= ESR_PTR;

		kvmppc_core_queue_program(vcpu);

		advance = 0;

		break;