From mboxrd@z Thu Jan 1 00:00:00 1970 From: Scott Wood Subject: Re: [PATCH] KVM: PPC: BookE: Include trap in pt_regs Date: Thu, 17 May 2012 11:37:45 -0500 Message-ID: <4FB52959.2070107@freescale.com> References: <1337174756-6998-1-git-send-email-agraf@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Cc: kvm-ppc , kvm list To: Alexander Graf Return-path: In-Reply-To: <1337174756-6998-1-git-send-email-agraf@suse.de> Sender: kvm-ppc-owner@vger.kernel.org List-Id: kvm.vger.kernel.org On 05/16/2012 08:25 AM, Alexander Graf wrote: > When reinjecting host interrupt requests in the exit handler code, > let's also tell the interrupt handler which interrupt number we're > coming from. > > Signed-off-by: Alexander Graf > --- > arch/powerpc/kvm/booke.c | 12 +++++++----- > 1 files changed, 7 insertions(+), 5 deletions(-) > > diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c > index 72f13f4..0512bd7 100644 > --- a/arch/powerpc/kvm/booke.c > +++ b/arch/powerpc/kvm/booke.c > @@ -596,7 +596,8 @@ static int emulation_exit(struct kvm_run *run, struct kvm_vcpu *vcpu) > } > } > > -static void kvmppc_fill_pt_regs(struct pt_regs *regs) > +static void kvmppc_fill_pt_regs(struct pt_regs *regs, > + int exit_nr) > { > ulong r1, ip, msr, lr; > > @@ -610,6 +611,7 @@ static void kvmppc_fill_pt_regs(struct pt_regs *regs) > regs->nip = ip; > regs->msr = msr; > regs->link = lr; > + regs->trap = exit_nr; > } > > static void kvmppc_restart_interrupt(struct kvm_vcpu *vcpu, > @@ -619,16 +621,16 @@ static void kvmppc_restart_interrupt(struct kvm_vcpu *vcpu, > > switch (exit_nr) { > case BOOKE_INTERRUPT_EXTERNAL: > - kvmppc_fill_pt_regs(®s); > + kvmppc_fill_pt_regs(®s, exit_nr); > do_IRQ(®s); > break; exit_nr is not the same as the trap number that the rest of the kernel wants to see. -Scott