From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50144) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tl8yJ-0003A6-Ft for qemu-devel@nongnu.org; Tue, 18 Dec 2012 21:01:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tl8yI-0006SS-4O for qemu-devel@nongnu.org; Tue, 18 Dec 2012 21:01:23 -0500 Received: from e7.ny.us.ibm.com ([32.97.182.137]:57462) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tl8yI-0006Qn-0I for qemu-devel@nongnu.org; Tue, 18 Dec 2012 21:01:22 -0500 Received: from /spool/local by e7.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 18 Dec 2012 21:01:18 -0500 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id 065CFC9003E for ; Tue, 18 Dec 2012 21:01:12 -0500 (EST) Received: from d03av06.boulder.ibm.com (d03av06.boulder.ibm.com [9.17.195.245]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qBJ21BNg227242 for ; Tue, 18 Dec 2012 21:01:11 -0500 Received: from d03av06.boulder.ibm.com (loopback [127.0.0.1]) by d03av06.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qBJ23Dvl032463 for ; Tue, 18 Dec 2012 19:03:14 -0700 From: Anthony Liguori In-Reply-To: <87r4mmnbl4.fsf@codemonkey.ws> References: <1355768254-12933-1-git-send-email-pbonzini@redhat.com> <87623z6pr1.fsf@codemonkey.ws> <50D0DBF9.7070108@redhat.com> <87r4mmnbl4.fsf@codemonkey.ws> Date: Tue, 18 Dec 2012 20:00:58 -0600 Message-ID: <87d2y6ztph.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii 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: Paolo Bonzini Cc: Alex Graf , David Gibson , qemu-devel@nongnu.org, "Michael S. Tsirkin" 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 > > 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 >>>