Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=fcfdbd...
Commit: fcfdbd266a41d3e41d17666de410a24995fde03a
Parent: d4cf3892e50b8e35341086a4fe2bb8a3989b55d4
Author: Hollis Blanchard <hollisb@us.ibm.com>
AuthorDate: Wed Nov 5 09:36:24 2008 -0600
Committer: Avi Kivity <avi@redhat.com>
CommitDate: Wed Dec 31 16:52:24 2008 +0200
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: Hollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
---
arch/powerpc/kvm/emulate.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/kvm/emulate.c b/arch/powerpc/kvm/emulate.c
index 814f1e6..4c30fa0 100644
--- a/arch/powerpc/kvm/emulate.c
+++ b/arch/powerpc/kvm/emulate.c
@@ -74,8 +74,8 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
int advance = 1;
switch (get_op(inst)) {
- case 3: /* trap */
- printk("trap!\n");
+ case 3: /* trap */
+ vcpu->arch.esr |= ESR_PTR;
kvmppc_core_queue_program(vcpu);
advance = 0;
break;
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
