From patchwork Wed Dec 19 00:13:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 207232 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C9C982C0092 for ; Wed, 19 Dec 2012 11:13:35 +1100 (EST) Received: from localhost ([::1]:44190 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tl7Hx-0007F7-St for incoming@patchwork.ozlabs.org; Tue, 18 Dec 2012 19:13:33 -0500 Received: from eggs.gnu.org ([208.118.235.92]:59823) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tl7Hp-0007EA-NZ for qemu-devel@nongnu.org; Tue, 18 Dec 2012 19:13:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tl7Hm-0001i1-Ck for qemu-devel@nongnu.org; Tue, 18 Dec 2012 19:13:25 -0500 Received: from e9.ny.us.ibm.com ([32.97.182.139]:35486) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tl7Hm-0001hr-8v for qemu-devel@nongnu.org; Tue, 18 Dec 2012 19:13:22 -0500 Received: from /spool/local by e9.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 18 Dec 2012 19:13:21 -0500 Received: from d01dlp02.pok.ibm.com (9.56.250.167) by e9.ny.us.ibm.com (192.168.1.109) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 18 Dec 2012 19:13:20 -0500 Received: from d01relay01.pok.ibm.com (d01relay01.pok.ibm.com [9.56.227.233]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 8DF3A6E8053 for ; Tue, 18 Dec 2012 19:13:18 -0500 (EST) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay01.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qBJ0DIcq294390 for ; Tue, 18 Dec 2012 19:13:19 -0500 Received: from d01av03.pok.ibm.com (loopback [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qBJ0DIXG029250 for ; Tue, 18 Dec 2012 22:13:18 -0200 Received: from titi.na.relay.ibm.com ([9.57.64.68]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id qBJ0DDpG029001; Tue, 18 Dec 2012 22:13:16 -0200 From: Anthony Liguori To: Paolo Bonzini In-Reply-To: References: <1355768254-12933-1-git-send-email-pbonzini@redhat.com> <87623z6pr1.fsf@codemonkey.ws> <50D0DBF9.7070108@redhat.com> User-Agent: Notmuch/0.13.2+93~ged93d79 (http://notmuchmail.org) Emacs/23.3.1 (x86_64-pc-linux-gnu) Date: Tue, 18 Dec 2012 18:13:11 -0600 Message-ID: <87r4mmnbl4.fsf@codemonkey.ws> MIME-Version: 1.0 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12121900-7182-0000-0000-000003E363D8 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 32.97.182.139 Cc: Alex Graf , David Gibson , qemu-devel@nongnu.org, "Michael S. Tsirkin" Subject: Re: [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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... Paolo, you need to incorporate: 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 >> 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) {