From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:32840) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlPWu-0001au-QP for qemu-devel@nongnu.org; Wed, 19 Dec 2012 14:42:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TlPWs-0007wW-2V for qemu-devel@nongnu.org; Wed, 19 Dec 2012 14:42:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35931) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlPWr-0007wP-Qs for qemu-devel@nongnu.org; Wed, 19 Dec 2012 14:42:09 -0500 Date: Wed, 19 Dec 2012 21:45:15 +0200 From: "Michael S. Tsirkin" Message-ID: <20121219194514.GA29849@redhat.com> References: <1355768254-12933-1-git-send-email-pbonzini@redhat.com> <87623z6pr1.fsf@codemonkey.ws> <50D0DBF9.7070108@redhat.com> <87r4mmnbl4.fsf@codemonkey.ws> <87d2y6ztph.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87d2y6ztph.fsf@codemonkey.ws> Subject: Re: [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Paolo Bonzini , David Gibson , qemu-devel@nongnu.org, Alex Graf On Tue, Dec 18, 2012 at 08:00:58PM -0600, Anthony Liguori wrote: > Anthony Liguori writes: > > > Paolo Bonzini 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... > > > > It's not a conflict. You both have problems with your pull requests > > because I assume neither of you have libfdt installed which means a > > bunch of ppc is not being built. > > > > We really ought to pull in fdt as a submodule to prevent this type of > > thing... > > We the patches below, the changes pass all my tests so as soon as you > make these changes, it'll go in. > > Regards, > > Anthony Liguori I do have fdt actually, but build still passed for me. And I touched hw/ppc/e500plat.c and checked that it does get compiled. In my tree hw/ppc/e500plat.c did not include hw/pci.c so it's something to do with the merge. Maybe after all you could merge the pci tree? If Paolo merges it too it will be trivial to merge his ... > > > > Paolo, you need to incorporate: > > > > diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c > > index 5b16096..aa54fd8 100644 > > --- a/hw/ppc/e500.c > > +++ b/hw/ppc/e500.c > > @@ -18,7 +18,8 @@ > > #include "qemu-common.h" > > #include "e500.h" > > #include "e500-ccsr.h" > > -#include "net.h" > > +#include "net/net.h" > > +#include "qemu/config-file.h" > > #include "hw/hw.h" > > #include "hw/serial.h" > > #include "hw/pci/pci.h" > > > > diff --git a/hw/spapr.c b/hw/spapr.c > > index 071cf41..fdd1eb6 100644 > > --- a/hw/spapr.c > > +++ b/hw/spapr.c > > @@ -49,6 +49,7 @@ > > > > #include "exec/address-spaces.h" > > #include "hw/usb.h" > > +#include "qemu/config-file.h" > > > > #include > > > > Michael, you need to incorporate: > > > > diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c > > index ea4134c..4deb02a 100644 > > --- a/hw/ppc/e500plat.c > > +++ b/hw/ppc/e500plat.c > > @@ -14,7 +14,7 @@ > > #include "e500.h" > > #include "../boards.h" > > #include "sysemu/device_tree.h" > > -#include "hw/pci.h" > > +#include "hw/pci/pci.h" > > > > static void e500plat_fixup_devtree(PPCE500Params *params, void *fdt) > > { > > > > I can't do this through a merge commit because the branches being merged > > aren't bisectable so please update and resend. It's probably easiest to > > do it all through Paolo's branch to make sure there are no conflicts > > between the two branches. > > > > Regards, > > > > Anthony Liguori > > > >> > >> Paolo > >> > >> > >> > >> On Tue, Dec 18, 2012 at 10:11 PM, Paolo Bonzini 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 > >>>