Add __rte_msvc_pack to all __rte_packed structs to cause packing
when building with MSVC.
Signed-off-by: Tyler Retzlaff <roret...@linux.microsoft.com>
---
lib/eal/common/eal_private.h | 1 +
lib/eal/include/rte_memory.h | 1 +
lib/eal/include/rte_memzone.h | 1 +
lib/eal/include/rte_trace_point.h | 1 +
lib/eal/x86/include/rte_memcpy.h | 3 +++
5 files changed, 7 insertions(+)
diff --git a/lib/eal/common/eal_private.h b/lib/eal/common/eal_private.h
index 71523cf..21ace2a 100644
--- a/lib/eal/common/eal_private.h
+++ b/lib/eal/common/eal_private.h
@@ -43,6 +43,7 @@ struct lcore_config {
/**
* The global RTE configuration structure.
*/
+__rte_msvc_pack
struct rte_config {
uint32_t main_lcore; /**< Id of the main lcore */
uint32_t lcore_count; /**< Number of available logical cores. */
diff --git a/lib/eal/include/rte_memory.h b/lib/eal/include/rte_memory.h
index 842362d..73bb00d 100644
--- a/lib/eal/include/rte_memory.h
+++ b/lib/eal/include/rte_memory.h
@@ -46,6 +46,7 @@
/**
* Physical memory segment descriptor.
*/
+__rte_msvc_pack
struct rte_memseg {
rte_iova_t iova; /**< Start IO address. */
union {
diff --git a/lib/eal/include/rte_memzone.h b/lib/eal/include/rte_memzone.h
index 931497f..ca312c0 100644
--- a/lib/eal/include/rte_memzone.h
+++ b/lib/eal/include/rte_memzone.h
@@ -45,6 +45,7 @@
* A structure describing a memzone, which is a contiguous portion of
* physical memory identified by a name.
*/
+__rte_msvc_pack
struct rte_memzone {
#define RTE_MEMZONE_NAMESIZE 32 /**< Maximum length of memory zone
name.*/
diff --git a/lib/eal/include/rte_trace_point.h
b/lib/eal/include/rte_trace_point.h
index 41e2a7f..63f333c 100644
--- a/lib/eal/include/rte_trace_point.h
+++ b/lib/eal/include/rte_trace_point.h
@@ -292,6 +292,7 @@ int __rte_trace_point_register(rte_trace_point_t *trace,
const char *name,
#define __RTE_TRACE_FIELD_ENABLE_MASK (1ULL << 63)
#define __RTE_TRACE_FIELD_ENABLE_DISCARD (1ULL << 62)
+__rte_msvc_pack
struct __rte_trace_stream_header {
uint32_t magic;
rte_uuid_t uuid;
diff --git a/lib/eal/x86/include/rte_memcpy.h b/lib/eal/x86/include/rte_memcpy.h
index 72a9229..fdc5df0 100644
--- a/lib/eal/x86/include/rte_memcpy.h
+++ b/lib/eal/x86/include/rte_memcpy.h
@@ -57,12 +57,15 @@
* Use the following structs to avoid violating C standard
* alignment requirements and to avoid strict aliasing bugs
*/
+ __rte_msvc_pack
struct rte_uint64_alias {
uint64_t val;
} __rte_packed __rte_may_alias;
+ __rte_msvc_pack
struct rte_uint32_alias {
uint32_t val;
} __rte_packed __rte_may_alias;
+ __rte_msvc_pack
struct rte_uint16_alias {
uint16_t val;
} __rte_packed __rte_may_alias;
--
1.8.3.1
