[dpdk-dev] [PATCH] vfio: Fix spapr vfio compile on some OS's

[dpdk-dev] [PATCH] vfio: Fix spapr vfio compile on some OS's

[Anatoly Burakov]

From: "Burakov, Anatoly" <anatoly.burakov@intel.com>

Some compilers require definition of vfio_iommu_spapr_tce_ddw_info
before its use in vfio_iommu_spapr_tce_info, so move tce_info
definition below tce_ddw_info.

Fixes: 45385235aece ("vfio: fix compile on older kernels")

Signed-off-by: Burakov, Anatoly <anatoly.burakov@intel.com>
---
 lib/librte_eal/linuxapp/eal/eal_vfio.h | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio.h b/lib/librte_eal/linuxapp/eal/eal_vfio.h
index 0bf85bb..72f1f75 100644
--- a/lib/librte_eal/linuxapp/eal/eal_vfio.h
+++ b/lib/librte_eal/linuxapp/eal/eal_vfio.h
@@ -60,19 +60,6 @@
 #define VFIO_IOMMU_SPAPR_TCE_CREATE _IO(VFIO_TYPE, VFIO_BASE + 19)
 #define VFIO_IOMMU_SPAPR_TCE_REMOVE _IO(VFIO_TYPE, VFIO_BASE + 20)
 
-/* SPAPR_v2 is not present, but SPAPR might be */
-#ifndef VFIO_SPAPR_TCE_IOMMU
-#define VFIO_IOMMU_SPAPR_TCE_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12)
-
-struct vfio_iommu_spapr_tce_info {
-	uint32_t argsz;
-	uint32_t flags;
-	uint32_t dma32_window_start;
-	uint32_t dma32_window_size;
-	struct vfio_iommu_spapr_tce_ddw_info ddw;
-};
-#endif
-
 struct vfio_iommu_spapr_register_memory {
 	uint32_t argsz;
 	uint32_t flags;
@@ -97,7 +84,21 @@ struct vfio_iommu_spapr_tce_ddw_info {
 	uint32_t max_dynamic_windows_supported;
 	uint32_t levels;
 };
-#else
+
+/* SPAPR_v2 is not present, but SPAPR might be */
+#ifndef VFIO_SPAPR_TCE_IOMMU
+#define VFIO_IOMMU_SPAPR_TCE_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12)
+
+struct vfio_iommu_spapr_tce_info {
+	uint32_t argsz;
+	uint32_t flags;
+	uint32_t dma32_window_start;
+	uint32_t dma32_window_size;
+	struct vfio_iommu_spapr_tce_ddw_info ddw;
+};
+#endif /* VFIO_SPAPR_TCE_IOMMU */
+
+#else /* VFIO_SPAPR_TCE_v2_IOMMU */
 #define RTE_VFIO_SPAPR VFIO_SPAPR_TCE_v2_IOMMU
 #endif
 
-- 
2.9.3

Re: [dpdk-dev] [PATCH] vfio: Fix spapr vfio compile on some OS's

[Thomas Monjalon]

2017-04-03 13:58, Anatoly Burakov:
> From: "Burakov, Anatoly" <anatoly.burakov@intel.com>
> 
> Some compilers require definition of vfio_iommu_spapr_tce_ddw_info
> before its use in vfio_iommu_spapr_tce_info, so move tce_info
> definition below tce_ddw_info.
> 
> Fixes: 45385235aece ("vfio: fix compile on older kernels")
> 
> Signed-off-by: Burakov, Anatoly <anatoly.burakov@intel.com>

Applied, thanks