> -----Original Message----- > From: Alexander Graf [mailto:[email protected]] > Sent: Wednesday, July 04, 2012 4:41 PM > To: Caraman Mihai Claudiu-B02008 > Cc: [email protected]; [email protected]; linuxppc- > [email protected]; [email protected] > Subject: Re: [Qemu-ppc] [RFC PATCH 04/17] KVM: PPC64: booke: Add guest > computation mode for irq delivery > > > On 25.06.2012, at 14:26, Mihai Caraman wrote: > > > Signed-off-by: Mihai Caraman <[email protected]> > > --- > > arch/powerpc/kvm/booke.c | 8 +++++++- > > 1 files changed, 7 insertions(+), 1 deletions(-) > > > > diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c > > index d15c4b5..93b48e0 100644 > > --- a/arch/powerpc/kvm/booke.c > > +++ b/arch/powerpc/kvm/booke.c > > @@ -287,6 +287,7 @@ static int kvmppc_booke_irqprio_deliver(struct > kvm_vcpu *vcpu, > > bool crit; > > bool keep_irq = false; > > enum int_class int_class; > > + ulong msr_cm = 0; > > > > /* Truncate crit indicators in 32 bit mode */ > > if (!(vcpu->arch.shared->msr & MSR_SF)) { > > @@ -299,6 +300,10 @@ static int kvmppc_booke_irqprio_deliver(struct > kvm_vcpu *vcpu, > > /* ... and we're in supervisor mode */ > > crit = crit && !(vcpu->arch.shared->msr & MSR_PR); > > > > +#ifdef CONFIG_64BIT > > + msr_cm = vcpu->arch.epcr & SPRN_EPCR_ICM ? MSR_CM : 0; > > +#endif > > No need for the ifdef, no?. Just mask EPCR_ICM out in the 32-bit host > case, then this check is always false on 32-bit hosts.
It will break e500v2. epcr field is declared only for CONFIG_KVM_BOOKE_HV, we can limit to this instead of CONFIG_64BIT. -Mike -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
