Re: [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue

[Anthony Liguori]

Paolo Bonzini <address@hidden> writes:

> And how does it conflicts with Alex's ppc pull request? It is a fast
> forward from origin/master as of now (commit a8a826a, exec: refactor
> cpu_restore_state, 2012-12-04), and that includes Alex's commits...

Something from the e500 changes because hw/ppc/e500.c and
hw/ppc/e500plat.c broke after the merge.

But since it was the wrong tree, maybe your new branch will not have
this problem.

It was easy to fix, so don't worry about it.  I can resolve as a merge
conflict if needed.

Regards,

Anthony Liguori

>
> Paolo
>
>
>
> On Tue, Dec 18, 2012 at 10:11 PM, Paolo Bonzini <address@hidden> wrote:
>
>> Il 18/12/2012 21:59, Anthony Liguori ha scritto:
>> > But this series breaks the build of make check.  It's not just one test
>> > case but almost every single one.  I think you must have eliminated an
>> > implicit include of qemu-common.h which makes PRId64 et al all
>> > undeclared.
>> >
>> > I started fixing this too but it became too much for a merge commit
>> > since it affects almost all tests.
>> >
>> > Can you fixup make check and send this series out?  I'll make sure to
>> > check tomorrow and merge your pull request if I see it tomorrow.
>> > Otherwise, let me know when you plan on sending it and I'll make sure to
>> > be available to merge it.
>>
>> Hmm, I must have pushed the wrong branch because I remember this failure.
>>
>> Paolo
>>