From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:48410) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ROCOy-0003dR-QG for qemu-devel@nongnu.org; Wed, 09 Nov 2011 12:57:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ROCOx-0003yP-Fx for qemu-devel@nongnu.org; Wed, 09 Nov 2011 12:57:32 -0500 Received: from mail-gx0-f173.google.com ([209.85.161.173]:56315) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ROCOx-0003yL-Bd for qemu-devel@nongnu.org; Wed, 09 Nov 2011 12:57:31 -0500 Received: by ggnp2 with SMTP id p2so2231192ggn.4 for ; Wed, 09 Nov 2011 09:57:30 -0800 (PST) Message-ID: <4EBABF07.6090307@codemonkey.ws> Date: Wed, 09 Nov 2011 11:57:27 -0600 From: Anthony Liguori MIME-Version: 1.0 References: <1320802728-21841-1-git-send-email-agraf@suse.de> <4EBA16A1.9090703@weilnetz.de> <4EBA558A.20707@suse.de> In-Reply-To: <4EBA558A.20707@suse.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH] pci-stub: fix compile breakage with qmp List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= Cc: Stefan Weil , Luiz Capitulino , Alexander Graf , qemu-devel@nongnu.org On 11/09/2011 04:27 AM, Andreas Färber 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 ‘(’ before ‘{’ 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 >>> Signed-off-by: Alexander Graf >>> --- >>> 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. > > If make clean didn't help, please patch that instead then. make clean is not meant to remove old files from old builds. Regards, Anthony Liguori > > Andreas >