From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:56479)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1RO7ZO-0002sP-3Y
	for qemu-devel@nongnu.org; Wed, 09 Nov 2011 07:47:58 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1RO7ZM-0007LN-Ff
	for qemu-devel@nongnu.org; Wed, 09 Nov 2011 07:47:58 -0500
Received: from mx1.redhat.com ([209.132.183.28]:53112)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1RO7ZM-0007LH-8a
	for qemu-devel@nongnu.org; Wed, 09 Nov 2011 07:47:56 -0500
Date: Wed, 9 Nov 2011 10:47:51 -0200
From: Luiz Capitulino <lcapitulino@redhat.com>
Message-ID: <20111109104751.3b5a028d@doriath>
In-Reply-To: <4EBA558A.20707@suse.de>
References: <1320802728-21841-1-git-send-email-agraf@suse.de>
	<4EBA16A1.9090703@weilnetz.de> <4EBA558A.20707@suse.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH] pci-stub: fix compile breakage with qmp
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Andreas =?ISO-8859-1?B?RuRyYmVy?= <afaerber@suse.de>
Cc: Stefan Weil <sw@weilnetz.de>, Alexander Graf <agraf@suse.de>, qemu-devel@nongnu.org

On Wed, 09 Nov 2011 11:27:22 +0100
Andreas F=C3=A4rber <afaerber@suse.de> wrote:

> Am 09.11.2011 06:58, schrieb Stefan Weil:
> > Am 09.11.2011 02:38, schrieb Alexander Graf:
> >> Commit 79627472db3 introduced breakage in compiling the s390x-softmmu
> >> target. Instead of compiling, it just throws a lot of errors:
> >>
> >> In file included from /dev/shm/qemu/hw/pci-stub.c:24:
> >> ./qmp-commands.h:3: error: expected identifier or =E2=80=98(=E2=80=99 =
before =E2=80=98{=E2=80=99 token
> >> [...]
> >>
> >> This is because we have two files called qmp-commands.h. One resides in
> >> the root directory of the source tree. The other one resides in the
> >> target
> >> build directory.
> >>
> >> Because pci-stub is not built in libhw, pci-stub.c seems to pick up the
> >> qmp-commands.h file from the target build directory which contains only
> >> definitions of qmp commands, not the function stubs.
> >>
> >> This patch at least fixes this breakage for me, allowing me to compile
> >> s390x-softmmu again.
> >>
> >> CC: Luiz Capitulino<lcapitulino@redhat.com>
> >> Signed-off-by: Alexander Graf<agraf@suse.de>
> >> ---
> >>   hw/pci-stub.c |    2 +-
> >>   1 files changed, 1 insertions(+), 1 deletions(-)
> >>
> >> diff --git a/hw/pci-stub.c b/hw/pci-stub.c
> >> index 636171c..ab9789c 100644
> >> --- a/hw/pci-stub.c
> >> +++ b/hw/pci-stub.c
> >> @@ -21,7 +21,7 @@
> >>   #include "sysemu.h"
> >>   #include "monitor.h"
> >>   #include "pci.h"
> >> -#include "qmp-commands.h"
> >> +#include "../qmp-commands.h"
> >>
> >>   PciInfoList *qmp_query_pci(Error **errp)
> >>   {
> >=20
> > No. Simply remove */qmp-commands.h. They are relicts from previous buil=
ds.
>=20
> If make clean didn't help, please patch that instead then.

So, did it fix the problem for you Alex?