MSVC struct packing is not compatible with GCC. Replace macro
__rte_packed with __rte_packed_begin to push existing pack value
and set packing to 1-byte and macro __rte_packed_end to restore
the pack value prior to the push.
Macro __rte_packed_end is deliberately utilized to trigger a
MSVC compiler warning if no existing packing has been pushed allowing
easy identification of locations where the __rte_packed_begin is
missing.
Signed-off-by: Andre Muezerie <andre...@linux.microsoft.com>
Reviewed-by: Tyler Retzlaff <roret...@linux.microsoft.com>
---
app/test/test_efd.c | 4 ++--
app/test/test_hash.c | 4 ++--
app/test/test_member.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/test/test_efd.c b/app/test/test_efd.c
index 1c0986b9bc..4a4379c563 100644
--- a/app/test/test_efd.c
+++ b/app/test/test_efd.c
@@ -33,13 +33,13 @@ test_efd(void)
static unsigned int test_socket_id;
/* 5-tuple key type */
-struct flow_key {
+struct __rte_packed_begin flow_key {
uint32_t ip_src;
uint32_t ip_dst;
uint16_t port_src;
uint16_t port_dst;
uint8_t proto;
-} __rte_packed;
+} __rte_packed_end;
RTE_LOG_REGISTER(efd_logtype_test, test.efd, INFO);
diff --git a/app/test/test_hash.c b/app/test/test_hash.c
index 65b9cad93c..6b5ef2d1e5 100644
--- a/app/test/test_hash.c
+++ b/app/test/test_hash.c
@@ -79,13 +79,13 @@ static uint32_t hashtest_key_lens[] = {0, 2, 4, 5, 6, 7, 8,
10, 11, 15, 16, 21,
* Should be packed to avoid holes with potentially
* undefined content in the middle.
*/
-struct flow_key {
+struct __rte_packed_begin flow_key {
uint32_t ip_src;
uint32_t ip_dst;
uint16_t port_src;
uint16_t port_dst;
uint32_t proto;
-} __rte_packed;
+} __rte_packed_end;
/*
* Hash function that always returns the same value, to easily test what
diff --git a/app/test/test_member.c b/app/test/test_member.c
index 5a4d2750db..a93787a10c 100644
--- a/app/test/test_member.c
+++ b/app/test/test_member.c
@@ -32,13 +32,13 @@ struct rte_member_setsum *setsum_vbf;
struct rte_member_setsum *setsum_sketch;
/* 5-tuple key type */
-struct flow_key {
+struct __rte_packed_begin flow_key {
uint32_t ip_src;
uint32_t ip_dst;
uint16_t port_src;
uint16_t port_dst;
uint8_t proto;
-} __rte_packed;
+} __rte_packed_end;
/* Set ID Macros for multimatch test usage */
#define M_MATCH_S 1 /* Not start with 0 since by default 0 means no match */
--
2.47.0.vfs.0.3
