From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Date: Sun, 25 Dec 2011 09:38:27 +0000 Subject: Re: Current kernel fails to compile with KVM on PowerPC Message-Id: <4EF6EF13.7080304@redhat.com> List-Id: References: <20111107194838.GA23558@alea.gnuu.de> <20111220202711.GD6830@alea.gnuu.de> <20111224103108.GA19586@alea.gnuu.de> <20111224111359.GB3938@alea.gnuu.de> In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Alexander Graf Cc: =?windows-1252?Q?J=F6rg_Sommer?= , Marcelo Tosatti , kvm list , kvm-ppc@vger.kernel.org, linux-kernel@vger.kernel.org On 12/24/2011 07:05 PM, Alexander Graf wrote: > I was actually thinking of: > > commit dfc209648daf8ba4197e71376b76c95fd26fd272 > Author: Andreas Schwab > Date: Tue Nov 8 07:17:39 2011 +0000 > > KVM: PPC: protect use of kvmppc_h_pr > > kvmppc_h_pr is only available if CONFIG_KVM_BOOK3S_64_PR. > > Signed-off-by: Andreas Schwab > Signed-off-by: Alexander Graf > > diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c > index 72559b0..aaefe19 100644 > --- a/arch/powerpc/kvm/book3s_pr.c > +++ b/arch/powerpc/kvm/book3s_pr.c > @@ -660,10 +660,12 @@ program_interrupt: > ulong cmd = kvmppc_get_gpr(vcpu, 3); > int i; > > +#ifdef CONFIG_KVM_BOOK3S_64_PR > if (kvmppc_h_pr(vcpu, cmd) = EMULATE_DONE) { > r = RESUME_GUEST; > break; > } > +#endif > > run->papr_hcall.nr = cmd; > for (i = 0; i < 9; ++i) { > > But yes :). I guess we need to make sure this commit also lands in 3.2 :(. > > Please post it ASAP, I'm preparing a pull request for 3.2. -- error compiling committee.c: too many arguments to function From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Re: Current kernel fails to compile with KVM on PowerPC Date: Sun, 25 Dec 2011 11:38:27 +0200 Message-ID: <4EF6EF13.7080304@redhat.com> References: <20111107194838.GA23558@alea.gnuu.de> <20111220202711.GD6830@alea.gnuu.de> <20111224103108.GA19586@alea.gnuu.de> <20111224111359.GB3938@alea.gnuu.de> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Cc: =?windows-1252?Q?J=F6rg_Sommer?= , Marcelo Tosatti , kvm list , kvm-ppc@vger.kernel.org, linux-kernel@vger.kernel.org To: Alexander Graf Return-path: In-Reply-To: Sender: kvm-ppc-owner@vger.kernel.org List-Id: kvm.vger.kernel.org On 12/24/2011 07:05 PM, Alexander Graf wrote: > I was actually thinking of: > > commit dfc209648daf8ba4197e71376b76c95fd26fd272 > Author: Andreas Schwab > Date: Tue Nov 8 07:17:39 2011 +0000 > > KVM: PPC: protect use of kvmppc_h_pr > > kvmppc_h_pr is only available if CONFIG_KVM_BOOK3S_64_PR. > > Signed-off-by: Andreas Schwab > Signed-off-by: Alexander Graf > > diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c > index 72559b0..aaefe19 100644 > --- a/arch/powerpc/kvm/book3s_pr.c > +++ b/arch/powerpc/kvm/book3s_pr.c > @@ -660,10 +660,12 @@ program_interrupt: > ulong cmd = kvmppc_get_gpr(vcpu, 3); > int i; > > +#ifdef CONFIG_KVM_BOOK3S_64_PR > if (kvmppc_h_pr(vcpu, cmd) == EMULATE_DONE) { > r = RESUME_GUEST; > break; > } > +#endif > > run->papr_hcall.nr = cmd; > for (i = 0; i < 9; ++i) { > > But yes :). I guess we need to make sure this commit also lands in 3.2 :(. > > Please post it ASAP, I'm preparing a pull request for 3.2. -- error compiling committee.c: too many arguments to function