From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:40814) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ROCSY-0005c7-Sx for qemu-devel@nongnu.org; Wed, 09 Nov 2011 13:01:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ROCSX-0004o8-F5 for qemu-devel@nongnu.org; Wed, 09 Nov 2011 13:01:14 -0500 Received: from cantor2.suse.de ([195.135.220.15]:42410 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ROCSX-0004ne-2p for qemu-devel@nongnu.org; Wed, 09 Nov 2011 13:01:13 -0500 Message-ID: <4EBABFE1.4070200@suse.de> Date: Wed, 09 Nov 2011 19:01:05 +0100 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= MIME-Version: 1.0 References: <1320802728-21841-1-git-send-email-agraf@suse.de> <4EBA16A1.9090703@weilnetz.de> <4EBA558A.20707@suse.de> <4EBABF07.6090307@codemonkey.ws> In-Reply-To: <4EBABF07.6090307@codemonkey.ws> 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Stefan Weil , Luiz Capitulino , Alexander Graf , qemu-devel@nongnu.org Am 09.11.2011 18:57, schrieb Anthony Liguori: > On 11/09/2011 04:27 AM, Andreas F=C3=A4rber 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-softmm= u >>>> 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 o= nly >>>> definitions of qmp commands, not the function stubs. >>>> >>>> This patch at least fixes this breakage for me, allowing me to compi= le >>>> 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. >=20 > make clean is not meant to remove old files from old builds. We have been using it that way in the past and I am not aware of a patch that removed ancient cleanups, so it's good practice to keep it working that way. When I do a git pull I don't know whether or what it may bring. Always doing make clean just-in-case is simply unproductive. Regards, Andreas --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=C3=B6rffer; HRB 16746 AG N=C3=BC= rnberg