On Tue, Aug 22, 2017 at 11:52:00AM +0100, Peter Maydell wrote: > On 22 August 2017 at 11:41, Laurent Vivier <lviv...@redhat.com> wrote: > > On 22/08/2017 11:53, Peter Maydell wrote: > >> On 22 August 2017 at 10:43, Laurent Vivier <lviv...@redhat.com> wrote: > >>> On 22/08/2017 11:34, Peter Maydell wrote: > >>>> I get a make check failure on ppc64 Linux: > >>>> > >>>> TEST: tests/postcopy-test... (pid=12468) > >>>> /ppc64/postcopy: > >>>> Broken pipe > >>>> qemu-system-ppc64: RP: Received invalid message 0x0000 length 0x0000 > >>>> FAIL > >>>> GTester: last random seed: R02Se5468e06f561627824306d95b0566d2b > >>>> (pid=13011) > >>>> FAIL: tests/postcopy-test > > > > The problem is in: > > > > bool kvmppc_pvr_workaround_required(PowerPCCPU *cpu) > > { > > CPUState *cs = CPU(cpu); > > > > if (cap_ppc_pvr_compat) { > > return false; > > } > > > > return !kvmppc_is_pr(cs->kvm_state); > > } > > > > It guesses !kvm pr means kvm_hv. That is not true, it can be TCG. > > > > This fixes the problem for me: > > --- a/target/ppc/kvm.c > > +++ b/target/ppc/kvm.c > > @@ -2817,5 +2817,5 @@ bool kvmppc_pvr_workaround_required(PowerPCCPU *cpu) > > return false; > > } > > > > - return !kvmppc_is_pr(cs->kvm_state); > > + return kvm_enabled() && !kvmppc_is_pr(cs->kvm_state); > > } > > Yep, fixes the failure for me too. David, can you respin your > pull request, please?
Done. In the interests of getting it out quickly, I haven't done the full usual set of tests, though I have done a make check on a ppc host both with and without KVM available. A tweaked version of the fix above is the only change, so I'm hoping the testing round on the previous pullreq should suffice. -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature