Re: [Qemu-devel] [PATCH] pci-stub: fix compile breakage with qmp

[Alexander Graf]

On 09.11.2011, at 13:47, Luiz Capitulino wrote:

> On Wed, 09 Nov 2011 11:27:22 +0100
> Andreas Färber <address@hidden> 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<address@hidden>
>>>> Signed-off-by: Alexander Graf<address@hidden>
>>>> ---
>>>>  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.
> 
> So, did it fix the problem for you Alex?

Yup :). However, if I run into this other users / developers will too.


Alex