Skip to contentSkip to conversation

net: Include iov.h in checksum.h

PATCH Applied Alexander Graf 3 participants 5 messages Feb 6, 2014 – Feb 11, 2014 Networking

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: Include iov.h in checksum.h

The checksum calculation header exports a function that refers to struct iov which is defined in iov.h. Include the header so that the compiler knows what this struct is about.

Fixes the following compile failure for me:

In file included from hw/net/fsl_etsec/rings.c:24:0:
include/net/checksum.h:51:31: error: ‘struct iovec’ declared inside parameter list [-Werror] include/net/checksum.h:51:31: error: its scope is only this definition or declaration, which is probably not what you want [-Werror]

---
 include/net/checksum.h | 1 +
 1 file changed, 1 insertion(+)
include/net/checksum.h +1 -0
index 80203fb..a81cf65 100644
@@ -19,6 +19,7 @@
 #define QEMU_NET_CHECKSUM_H
 
 #include <stdint.h>
+#include "qemu/iov.h"
 
 uint32_t net_checksum_add_cont(int len, uint8_t *buf, int seq);
 uint16_t net_checksum_finish(uint32_t sum);
Signature · 1 line
1.8.1.4
#1 lore raw
Quoted 3 lines · Alexander Graf

The checksum calculation header exports a function that refers to struct iov which is defined in iov.h. Include the header so that the compiler knows what this struct is about.

Alternatively (and I sometimes prefer it this way), one can just declare `struct iovec;' instead of including whole header, because we don't actually use any definitions from there, and users of checksum.h wont be including extra dependencies which they don't use... Like this:

--- cut ---
Subject: net: declare struct iovec in checksum.h to fix compiler warning
From: Michael Tokarev <[email protected]>

The checksum calculation header exports a function that refers to struct iov defined in iov.h. Without including the former, build fails like this:

In file included from hw/net/fsl_etsec/rings.c:24:0:
include/net/checksum.h:51:31: error: ‘struct iovec’ declared inside parameter list [-Werror] include/net/checksum.h:51:31: error: its scope is only this definition or declaration, which is probably not what you want [-Werror]

Mention struct iovec there.

include/net/checksum.h +1 -0
index 80203fb..2d7a363 100644
@@ -19,6 +19,7 @@
 #define QEMU_NET_CHECKSUM_H
 
 #include <stdint.h>
+struct iovec;
 
 uint32_t net_checksum_add_cont(int len, uint8_t *buf, int seq);
 uint16_t net_checksum_finish(uint32_t sum);

--- cut ---
BTW, this is a -trivial matherial ;)

/mjt

#2 lore raw
Quoted 9 lines

Am 07.02.2014 um 08:05 schrieb Michael Tokarev <[email protected]>:

Quoted 3 lines · Alexander Graf

The checksum calculation header exports a function that refers to struct iov which is defined in iov.h. Include the header so that the compiler knows what this struct is about.

Quoted 5 lines

Alternatively (and I sometimes prefer it this way), one can just declare `struct iovec;' instead of including whole header, because we don't actually use any definitions from there, and users of checksum.h wont be including extra dependencies which they don't use... Like this:

Either way works for me :)

Alex

Quoted 33 lines

--- cut ---
Subject: net: declare struct iovec in checksum.h to fix compiler warning
From: Michael Tokarev <[email protected]>

The checksum calculation header exports a function that refers to struct iov defined in iov.h. Without including the former, build fails like this:

In file included from hw/net/fsl_etsec/rings.c:24:0:
include/net/checksum.h:51:31: error: �estruct iovec�f declared inside parameter list [-Werror] include/net/checksum.h:51:31: error: its scope is only this definition or declaration, which is probably not what you want [-Werror]

Mention struct iovec there.

include/net/checksum.h +1 -1
index 80203fb..2d7a363 100644
@@ -19,6 +19,7 @@
 #define QEMU_NET_CHECKSUM_H
 
 #include <stdint.h>
+struct iovec;
 
 uint32_t net_checksum_add_cont(int len, uint8_t *buf, int seq);
 uint16_t net_checksum_finish(uint32_t sum);
--- cut ---

BTW, this is a -trivial matherial ;)

/mjt

#3 lore raw
Quoted 9 lines · Alexander Graf
Quoted 9 lines

Am 07.02.2014 um 08:05 schrieb Michael Tokarev <[email protected]>:

Quoted 3 lines · Alexander Graf

The checksum calculation header exports a function that refers to struct iov which is defined in iov.h. Include the header so that the compiler knows what this struct is about.

Quoted 7 lines
Quoted 5 lines

Alternatively (and I sometimes prefer it this way), one can just declare `struct iovec;' instead of including whole header, because we don't actually use any definitions from there, and users of checksum.h wont be including extra dependencies which they don't use... Like this:

Either way works for me :)

Yes, please take one of them via -trivial.

Stefan

#4 lore raw

10.02.2014 14:20, Stefan Hajnoczi пишет:

Quoted 16 lines · Alexander Graf
Quoted 15 lines
Quoted 14 lines

Am 07.02.2014 um 08:05 schrieb Michael Tokarev <[email protected]>:

Quoted 3 lines · Alexander Graf

The checksum calculation header exports a function that refers to struct iov which is defined in iov.h. Include the header so that the compiler knows what this struct is about.

Alternatively (and I sometimes prefer it this way), one can just declare `struct iovec;' instead of including whole header, because we don't actually use any definitions from there, and users of checksum.h wont be including extra dependencies which they don't use... Like this:

Quoted 3 lines
Quoted 1 line

Either way works for me :)

Yes, please take one of them via -trivial.

I've applied my version to -trivial.

Thanks,

/mjt