block/nbd: Add missing <qemu/bswap.h> include

[PATCH-for-8.0] block/nbd: Add missing <qemu/bswap.h> include

Posted by Philippe Mathieu-Daudé 1 year, 4 months ago

The inlined nbd_readXX() functions call beXX_to_cpu(), themselves
declared in <qemu/bswap.h>. This fixes when refactoring:

  In file included from ../../block/nbd.c:44:
  include/block/nbd.h: In function 'nbd_read16':
  include/block/nbd.h:383:12: error: implicit declaration of function 'be16_to_cpu' [-Werror=implicit-function-declaration]
    383 |     *val = be##bits##_to_cpu(*val);                                     \
        |            ^~
  include/block/nbd.h:387:1: note: in expansion of macro 'DEF_NBD_READ_N'
    387 | DEF_NBD_READ_N(16) /* Defines nbd_read16(). */
        | ^~~~~~~~~~~~~~

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 include/block/nbd.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/block/nbd.h b/include/block/nbd.h
index 4ede3b2bd0..a4c98169c3 100644
--- a/include/block/nbd.h
+++ b/include/block/nbd.h
@@ -24,6 +24,7 @@
 #include "io/channel-socket.h"
 #include "crypto/tlscreds.h"
 #include "qapi/error.h"
+#include "qemu/bswap.h"
 
 extern const BlockExportDriver blk_exp_nbd;
 
-- 
2.38.1

Re: [PATCH-for-8.0] block/nbd: Add missing <qemu/bswap.h> include

Posted by Kevin Wolf 1 year, 3 months ago

Am 25.11.2022 um 18:53 hat Philippe Mathieu-Daudé geschrieben:
> The inlined nbd_readXX() functions call beXX_to_cpu(), themselves
> declared in <qemu/bswap.h>. This fixes when refactoring:
> 
>   In file included from ../../block/nbd.c:44:
>   include/block/nbd.h: In function 'nbd_read16':
>   include/block/nbd.h:383:12: error: implicit declaration of function 'be16_to_cpu' [-Werror=implicit-function-declaration]
>     383 |     *val = be##bits##_to_cpu(*val);                                     \
>         |            ^~
>   include/block/nbd.h:387:1: note: in expansion of macro 'DEF_NBD_READ_N'
>     387 | DEF_NBD_READ_N(16) /* Defines nbd_read16(). */
>         | ^~~~~~~~~~~~~~
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Thanks, applied to the block branch.

Kevin

Re: [PATCH-for-8.0] block/nbd: Add missing <qemu/bswap.h> include

Posted by Philippe Mathieu-Daudé 1 year, 3 months ago

Hi, can this reviewed patch get merged via a block tree?

On 25/11/22 18:53, Philippe Mathieu-Daudé wrote:
> The inlined nbd_readXX() functions call beXX_to_cpu(), themselves
> declared in <qemu/bswap.h>. This fixes when refactoring:
> 
>    In file included from ../../block/nbd.c:44:
>    include/block/nbd.h: In function 'nbd_read16':
>    include/block/nbd.h:383:12: error: implicit declaration of function 'be16_to_cpu' [-Werror=implicit-function-declaration]
>      383 |     *val = be##bits##_to_cpu(*val);                                     \
>          |            ^~
>    include/block/nbd.h:387:1: note: in expansion of macro 'DEF_NBD_READ_N'
>      387 | DEF_NBD_READ_N(16) /* Defines nbd_read16(). */
>          | ^~~~~~~~~~~~~~
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   include/block/nbd.h | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/include/block/nbd.h b/include/block/nbd.h
> index 4ede3b2bd0..a4c98169c3 100644
> --- a/include/block/nbd.h
> +++ b/include/block/nbd.h
> @@ -24,6 +24,7 @@
>   #include "io/channel-socket.h"
>   #include "crypto/tlscreds.h"
>   #include "qapi/error.h"
> +#include "qemu/bswap.h"
>   
>   extern const BlockExportDriver blk_exp_nbd;
>

Re: [PATCH-for-8.0] block/nbd: Add missing <qemu/bswap.h> include

Posted by Laurent Vivier 1 year, 3 months ago

Le 12/01/2023 à 13:00, Philippe Mathieu-Daudé a écrit :
> Hi, can this reviewed patch get merged via a block tree?

I can take this via trivial.

Thanks,
Laurent

> 
> On 25/11/22 18:53, Philippe Mathieu-Daudé wrote:
>> The inlined nbd_readXX() functions call beXX_to_cpu(), themselves
>> declared in <qemu/bswap.h>. This fixes when refactoring:
>>
>>    In file included from ../../block/nbd.c:44:
>>    include/block/nbd.h: In function 'nbd_read16':
>>    include/block/nbd.h:383:12: error: implicit declaration of function 'be16_to_cpu' 
>> [-Werror=implicit-function-declaration]
>>      383 |     *val = be##bits##_to_cpu(*val);                                     \
>>          |            ^~
>>    include/block/nbd.h:387:1: note: in expansion of macro 'DEF_NBD_READ_N'
>>      387 | DEF_NBD_READ_N(16) /* Defines nbd_read16(). */
>>          | ^~~~~~~~~~~~~~
>>
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>> ---
>>   include/block/nbd.h | 1 +
>>   1 file changed, 1 insertion(+)
>>
>> diff --git a/include/block/nbd.h b/include/block/nbd.h
>> index 4ede3b2bd0..a4c98169c3 100644
>> --- a/include/block/nbd.h
>> +++ b/include/block/nbd.h
>> @@ -24,6 +24,7 @@
>>   #include "io/channel-socket.h"
>>   #include "crypto/tlscreds.h"
>>   #include "qapi/error.h"
>> +#include "qemu/bswap.h"
>>   extern const BlockExportDriver blk_exp_nbd;
> 
>

Re: [PATCH-for-8.0] block/nbd: Add missing <qemu/bswap.h> include

Posted by Vladimir Sementsov-Ogievskiy 1 year, 4 months ago

On 11/25/22 20:53, Philippe Mathieu-Daudé wrote:
> The inlined nbd_readXX() functions call beXX_to_cpu(), themselves
> declared in <qemu/bswap.h>. This fixes when refactoring:
> 
>    In file included from ../../block/nbd.c:44:
>    include/block/nbd.h: In function 'nbd_read16':
>    include/block/nbd.h:383:12: error: implicit declaration of function 'be16_to_cpu' [-Werror=implicit-function-declaration]
>      383 |     *val = be##bits##_to_cpu(*val);                                     \
>          |            ^~
>    include/block/nbd.h:387:1: note: in expansion of macro 'DEF_NBD_READ_N'
>      387 | DEF_NBD_READ_N(16) /* Defines nbd_read16(). */
>          | ^~~~~~~~~~~~~~
> 
> Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org>


Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>

-- 
Best regards,
Vladimir