From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:58160) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ROHpz-0001F2-D4 for qemu-devel@nongnu.org; Wed, 09 Nov 2011 18:45:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ROHpy-00013g-9K for qemu-devel@nongnu.org; Wed, 09 Nov 2011 18:45:47 -0500 Received: from cantor2.suse.de ([195.135.220.15]:33495 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ROHpx-00013O-Vw for qemu-devel@nongnu.org; Wed, 09 Nov 2011 18:45:46 -0500 Mime-Version: 1.0 (Apple Message framework v1084) Content-Type: text/plain; charset=windows-1252 From: Alexander Graf In-Reply-To: <20111109104751.3b5a028d@doriath> Date: Thu, 10 Nov 2011 00:45:44 +0100 Content-Transfer-Encoding: quoted-printable Message-Id: References: <1320802728-21841-1-git-send-email-agraf@suse.de> <4EBA16A1.9090703@weilnetz.de> <4EBA558A.20707@suse.de> <20111109104751.3b5a028d@doriath> 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: Luiz Capitulino Cc: Stefan Weil , =?iso-8859-1?Q?Andreas_F=E4rber?= , qemu-devel@nongnu.org On 09.11.2011, at 13:47, Luiz Capitulino wrote: > On Wed, 09 Nov 2011 11:27:22 +0100 > Andreas F=E4rber wrote: >=20 >> 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: >>>>=20 >>>> In file included from /dev/shm/qemu/hw/pci-stub.c:24: >>>> ./qmp-commands.h:3: error: expected identifier or =91(=92 before = =91{=92 token >>>> [...] >>>>=20 >>>> 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. >>>>=20 >>>> 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. >>>>=20 >>>> This patch at least fixes this breakage for me, allowing me to = compile >>>> s390x-softmmu again. >>>>=20 >>>> CC: Luiz Capitulino >>>> Signed-off-by: Alexander Graf >>>> --- >>>> hw/pci-stub.c | 2 +- >>>> 1 files changed, 1 insertions(+), 1 deletions(-) >>>>=20 >>>> 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" >>>>=20 >>>> PciInfoList *qmp_query_pci(Error **errp) >>>> { >>>=20 >>> No. Simply remove */qmp-commands.h. They are relicts from previous = builds. >>=20 >> If make clean didn't help, please patch that instead then. >=20 > So, did it fix the problem for you Alex? Yup :). However, if I run into this other users / developers will too. Alex