From mboxrd@z Thu Jan 1 00:00:00 1970 From: Scott Wood Subject: Re: [PATCH 3/4] KVM: PPC: BookE: Implement EPR exit Date: Fri, 4 Jan 2013 14:19:22 -0600 Message-ID: <1357330762.666.16@snotra> References: <1357321000-31008-4-git-send-email-agraf@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; delsp=Yes; format=Flowed Content-Transfer-Encoding: 8BIT Cc: , KVM list To: Alexander Graf Return-path: In-Reply-To: <1357321000-31008-4-git-send-email-agraf@suse.de> (from agraf@suse.de on Fri Jan 4 11:36:39 2013) Content-Disposition: inline Sender: kvm-ppc-owner@vger.kernel.org List-Id: kvm.vger.kernel.org On 01/04/2013 11:36:39 AM, Alexander Graf wrote: > diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c > index 4ae83f9..363301f 100644 > --- a/arch/powerpc/kvm/booke.c > +++ b/arch/powerpc/kvm/booke.c > @@ -306,7 +306,7 @@ static int kvmppc_booke_irqprio_deliver(struct > kvm_vcpu *vcpu, > { > int allowed = 0; > ulong msr_mask = 0; > - bool update_esr = false, update_dear = false; > + bool update_esr = false, update_dear = false, update_epr = > false; > ulong crit_raw = vcpu->arch.shared->critical; > ulong crit_r1 = kvmppc_get_gpr(vcpu, 1); > bool crit; > @@ -369,6 +369,8 @@ static int kvmppc_booke_irqprio_deliver(struct > kvm_vcpu *vcpu, > keep_irq = true; > /* fall through */ > case BOOKE_IRQPRIO_EXTERNAL: > + if (vcpu->arch.epr_enabled) > + update_epr = true; > case BOOKE_IRQPRIO_DBELL: We don't want to update EPR on decrementer/FIT. Also, missing fall-through comment. > @@ -762,6 +768,10 @@ static int kvm_vcpu_ioctl_enable_cap(struct > kvm_vcpu *vcpu, > r = 0; > vcpu->arch.papr_enabled = true; > break; > + case KVM_CAP_PPC_EPR: > + r = 0; > + vcpu->arch.epr_enabled = cap->args[0]; > + break; I don't see where the docs say that this capability uses args[0] as an enable/disable flag. -Scott