Patchwork xtensa_lx60: add missing #include "blockdev.h"

login
register
mail settings
Submitter Max Filippov
Date June 8, 2012, 9:50 a.m.
Message ID <1339149034-10163-1-git-send-email-jcmvbkbc@gmail.com>
Download mbox | patch
Permalink /patch/163740/
State New
Headers show

Comments

Max Filippov - June 8, 2012, 9:50 a.m.
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 <jcmvbkbc@gmail.com>
---
 hw/xtensa_lx60.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
Stefan Hajnoczi - June 8, 2012, 10:08 a.m.
On Fri, Jun 8, 2012 at 10:50 AM, Max Filippov <jcmvbkbc@gmail.com> 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 <jcmvbkbc@gmail.com>
> ---
>  hw/xtensa_lx60.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)

Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Stefan Weil - June 8, 2012, 10:43 a.m.
Am 08.06.2012 12:08, schrieb Stefan Hajnoczi:
> On Fri, Jun 8, 2012 at 10:50 AM, Max Filippov<jcmvbkbc@gmail.com>  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<jcmvbkbc@gmail.com>
>> ---
>>   hw/xtensa_lx60.c |    1 +
>>   1 files changed, 1 insertions(+), 0 deletions(-)
> Reviewed-by: Stefan Hajnoczi<stefanha@linux.vnet.ibm.com>
>


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.

What went wrong in your build, or are your sources different from qemu 
git master?

Regards,
Stefan Weil
Stefan Hajnoczi - June 8, 2012, 10:57 a.m.
On Fri, Jun 8, 2012 at 11:43 AM, Stefan Weil <sw@weilnetz.de> wrote:
> Am 08.06.2012 12:08, schrieb Stefan Hajnoczi:
>
>> On Fri, Jun 8, 2012 at 10:50 AM, Max Filippov<jcmvbkbc@gmail.com>  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<jcmvbkbc@gmail.com>
>>> ---
>>>  hw/xtensa_lx60.c |    1 +
>>>  1 files changed, 1 insertions(+), 0 deletions(-)
>>
>> Reviewed-by: Stefan Hajnoczi<stefanha@linux.vnet.ibm.com>
>>
>
>
> 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

I still think this patch is an improvement because relying on pc.h ->
fdc.h -> blockdev.h to get drive_get() and IF_PFLASH is very obscure
and could break in the future if those headers change.

Stefan
Stefan Weil - June 8, 2012, 12:05 p.m.
Am 08.06.2012 12:57, schrieb Stefan Hajnoczi:
> On Fri, Jun 8, 2012 at 11:43 AM, Stefan Weil<sw@weilnetz.de>  wrote:
>> Am 08.06.2012 12:08, schrieb Stefan Hajnoczi:
>>
>>> On Fri, Jun 8, 2012 at 10:50 AM, Max Filippov<jcmvbkbc@gmail.com>    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<jcmvbkbc@gmail.com>
>>>> ---
>>>>   hw/xtensa_lx60.c |    1 +
>>>>   1 files changed, 1 insertions(+), 0 deletions(-)
>>>
>>> Reviewed-by: Stefan Hajnoczi<stefanha@linux.vnet.ibm.com>
>>>
>>
>>
>> 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 <sw@weilnetz.de>.

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.

Regards,

Stefan W.
Stefan Hajnoczi - June 8, 2012, 12:43 p.m.
On Fri, Jun 8, 2012 at 1:05 PM, Stefan Weil <sw@weilnetz.de> wrote:
> Am 08.06.2012 12:57, schrieb Stefan Hajnoczi:
>
>> On Fri, Jun 8, 2012 at 11:43 AM, Stefan Weil<sw@weilnetz.de>  wrote:
>>>
>>> Am 08.06.2012 12:08, schrieb Stefan Hajnoczi:
>>>
>>>> On Fri, Jun 8, 2012 at 10:50 AM, Max Filippov<jcmvbkbc@gmail.com>
>>>>  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<jcmvbkbc@gmail.com>
>>>>> ---
>>>>>  hw/xtensa_lx60.c |    1 +
>>>>>  1 files changed, 1 insertions(+), 0 deletions(-)
>>>>
>>>>
>>>> Reviewed-by: Stefan Hajnoczi<stefanha@linux.vnet.ibm.com>
>>>>
>>>
>>>
>>> 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 <sw@weilnetz.de>.
>
> 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.

Thanks for finding the cause.  This makes sense now.

Stefan
Kevin Wolf - June 8, 2012, 1:01 p.m.
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<sw@weilnetz.de>  wrote:
>>> Am 08.06.2012 12:08, schrieb Stefan Hajnoczi:
>>>
>>>> On Fri, Jun 8, 2012 at 10:50 AM, Max Filippov<jcmvbkbc@gmail.com>    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<jcmvbkbc@gmail.com>
>>>>> ---
>>>>>   hw/xtensa_lx60.c |    1 +
>>>>>   1 files changed, 1 insertions(+), 0 deletions(-)
>>>>
>>>> Reviewed-by: Stefan Hajnoczi<stefanha@linux.vnet.ibm.com>
>>>>
>>>
>>>
>>> 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 <sw@weilnetz.de>.
> 
> 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

Patch

diff --git a/hw/xtensa_lx60.c b/hw/xtensa_lx60.c
index afdef49..cb759a9 100644
--- a/hw/xtensa_lx60.c
+++ b/hw/xtensa_lx60.c
@@ -34,6 +34,7 @@ 
 #include "pc.h"
 #include "sysbus.h"
 #include "flash.h"
+#include "blockdev.h"
 #include "xtensa_bootparam.h"
 
 typedef struct LxBoardDesc {