[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4EF6EF13.7080304@redhat.com>
Date: Sun, 25 Dec 2011 11:38:27 +0200
From: Avi Kivity <avi@...hat.com>
To: Alexander Graf <agraf@...e.de>
CC: Jörg Sommer <joerg@...a.gnuu.de>,
Marcelo Tosatti <mtosatti@...hat.com>,
kvm list <kvm@...r.kernel.org>, kvm-ppc@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: Re: Current kernel fails to compile with KVM on PowerPC
On 12/24/2011 07:05 PM, Alexander Graf wrote:
> I was actually thinking of:
>
> commit dfc209648daf8ba4197e71376b76c95fd26fd272
> Author: Andreas Schwab <schwab@...ux-m68k.org>
> 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 <schwab@...ux-m68k.org>
> Signed-off-by: Alexander Graf <agraf@...e.de>
>
> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists