From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:38023)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <sw@weilnetz.de>) id 1RO1CH-0003D0-59
	for qemu-devel@nongnu.org; Wed, 09 Nov 2011 00:59:41 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <sw@weilnetz.de>) id 1RO1CG-00035y-3h
	for qemu-devel@nongnu.org; Wed, 09 Nov 2011 00:59:41 -0500
Received: from v220110690675601.yourvserver.net ([78.47.199.172]:42565)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <sw@weilnetz.de>) id 1RO1CF-00035u-Tv
	for qemu-devel@nongnu.org; Wed, 09 Nov 2011 00:59:40 -0500
Message-ID: <4EBA16A1.9090703@weilnetz.de>
Date: Wed, 09 Nov 2011 06:58:57 +0100
From: Stefan Weil <sw@weilnetz.de>
MIME-Version: 1.0
References: <1320802728-21841-1-git-send-email-agraf@suse.de>
In-Reply-To: <1320802728-21841-1-git-send-email-agraf@suse.de>
Content-Type: text/plain; charset=UTF-8; format=flowed
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: Alexander Graf <agraf@suse.de>
Cc: qemu-devel@nongnu.org, Luiz Capitulino <lcapitulino@redhat.com>

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 b=
efore =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 tar=
get
> 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)
>   {

No. Simply remove */qmp-commands.h. They are relicts from previous builds=
.

Cheers,
Stefan