lkml.org 
[lkml]   [2008]   [Dec]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/44] KVM: ppc: improve trap emulation
    Date
    From: Hollis Blanchard <hollisb@us.ibm.com>

    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;
    --
    1.6.0.3


    \
     
     \ /
      Last update: 2008-12-09 21:27    [W:0.031 / U:121.720 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site