Re: [Qemu-devel] [PATCH] xtensa_lx60: add missing #include "blockdev.h"

[Kevin Wolf]

Am 08.06.2012 14:05, schrieb Stefan Weil:
> Am 08.06.2012 12:57, schrieb Stefan Hajnoczi:
>> On Fri, Jun 8, 2012 at 11:43 AM, Stefan Weil<address@hidden>  wrote:
>>> Am 08.06.2012 12:08, schrieb Stefan Hajnoczi:
>>>
>>>> On Fri, Jun 8, 2012 at 10:50 AM, Max Filippov<address@hidden>    wrote:
>>>>>
>>>>> This should fix the following build failure:
>>>>>
>>>>> /home/buildbot/slave-public/block_mingw32/build/hw/xtensa_lx60.c: In
>>>>> function 'lx_init':
>>>>> /home/buildbot/slave-public/block_mingw32/build/hw/xtensa_lx60.c:212:
>>>>> warning: implicit declaration of function 'drive_get'
>>>>> /home/buildbot/slave-public/block_mingw32/build/hw/xtensa_lx60.c:212:
>>>>> warning: nested extern declaration of 'drive_get'
>>>>> /home/buildbot/slave-public/block_mingw32/build/hw/xtensa_lx60.c:212:
>>>>> error: 'IF_PFLASH' undeclared (first use in this function)
>>>>> /home/buildbot/slave-public/block_mingw32/build/hw/xtensa_lx60.c:212:
>>>>> error: (Each undeclared identifier is reported only once
>>>>> /home/buildbot/slave-public/block_mingw32/build/hw/xtensa_lx60.c:212:
>>>>> error: for each function it appears in.)
>>>>> /home/buildbot/slave-public/block_mingw32/build/hw/xtensa_lx60.c:216:
>>>>> error: dereferencing pointer to incomplete type
>>>>>
>>>>> Signed-off-by: Max Filippov<address@hidden>
>>>>> ---
>>>>>   hw/xtensa_lx60.c |    1 +
>>>>>   1 files changed, 1 insertions(+), 0 deletions(-)
>>>>
>>>> Reviewed-by: Stefan Hajnoczi<address@hidden>
>>>>
>>>
>>>
>>> Strange, I don't see this problem here.
>>>
>>> xtensa_lx60.c includes pc.h which includes fdc.h which includes blockdev.h,
>>> so this patch should not be needed.
>>
>> Please check the buildbot output for more details on the failure:
>> http://buildbot.b1-systems.de/qemu/builders/block_mingw32/builds/237
> 
> The build failure for all hosts is introduced by commit
> d39e6563312a8ea3fb436cd2c7e6893cf416f34e in Kevin's block-next.
> 
> Kevin, please add Max' patch before that commit.
> Stefan H. already reviewed the patch, and if you want,
> you can now also add
> 
> Reviewed-by: Stefan Weil <address@hidden>.
> 
> QEMU git master still uses the old code where blockdev.h is
> included by hw/fdc.h, that's why I did not get that problem.

I already included Markus' patch in a pull request and Anthony said that
he pulled, even though the commit doesn't appear in master yet. I'll
take the patch into the block branch just in case, but I really think
this should be handled by Anthony directly, who can possibly still save
bisectability.

Kevin