Commit 5ac61299 authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

env_dpdk: fix build with DPDK 16.07 



DPDK commit 9df1ae8a888d ("eal: rename and move PCI resource structure")
introduced the new struct rte_mem_resource name; before that point, the
equivalent type was struct rte_pci_resource.

Since this is an easy fix, we can go ahead and patch around it; however,
users are highly recommended to use newer DPDK releases.

Change-Id: I27637136fa932f10032f5f76248da07120fa02a9
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/408743


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarDariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent 5d5e4028

lib/env_dpdk/vtophys.c

+4 −0
Original line number Diff line number Diff line
@@ -275,7 +275,11 @@ vtophys_get_paddr_pci(uint64_t vaddr) 
	struct spdk_vtophys_pci_device *vtophys_dev;

	uintptr_t paddr;

	struct rte_pci_device	*dev;

#if RTE_VERSION >= RTE_VERSION_NUM(16, 11, 0, 1)

	struct rte_mem_resource *res;

#else

	struct rte_pci_resource *res;

#endif

	unsigned r;



	pthread_mutex_lock(&g_vtophys_pci_devices_mutex);