[spp] [PATCH 2/3] make use of vhost PMD for SPP

[Itsuro Oda]

It is necessary to change only two defines to switch using
original vhost PMD to vhost PMD for SPP (spp_vhost).
Makefiles of each SPP processes are added to link spp_vhost.

Signed-off-by: Itsuro Oda <oda at valinux.co.jp>
---
 src/mirror/Makefile             | 3 +++
 src/nfv/Makefile                | 3 +++
 src/primary/Makefile            | 3 +++
 src/shared/common.h             | 2 +-
 src/shared/secondary/add_port.h | 2 +-
 src/vf/Makefile                 | 3 +++
 6 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/mirror/Makefile b/src/mirror/Makefile
index 0bd079a..f82b08f 100644
--- a/src/mirror/Makefile
+++ b/src/mirror/Makefile
@@ -53,4 +53,7 @@ LDLIBS += -lrte_pmd_ring
 LDLIBS += -lrte_pmd_vhost
 endif
 
+SPP_DRIVERS_DIR = $(BASE_OUTPUT)/src/drivers
+EXTRA_LDLIBS = -L$(SPP_DRIVERS_DIR)/vhost --whole-archive -lrte_pmd_spp_vhost --no-whole-archive
+
 include $(RTE_SDK)/mk/rte.extapp.mk
diff --git a/src/nfv/Makefile b/src/nfv/Makefile
index c3d2806..a717616 100644
--- a/src/nfv/Makefile
+++ b/src/nfv/Makefile
@@ -27,4 +27,7 @@ LDLIBS += -lrte_pmd_ring
 LDLIBS += -lrte_pmd_vhost
 endif
 
+SPP_DRIVERS_DIR = $(BASE_OUTPUT)/src/drivers
+EXTRA_LDLIBS = -L$(SPP_DRIVERS_DIR)/vhost --whole-archive -lrte_pmd_spp_vhost --no-whole-archive
+
 include $(RTE_SDK)/mk/rte.extapp.mk
diff --git a/src/primary/Makefile b/src/primary/Makefile
index 14d8f30..ace6228 100644
--- a/src/primary/Makefile
+++ b/src/primary/Makefile
@@ -41,4 +41,7 @@ endif
 # and so the next line can be removed in those cases.
 EXTRA_CFLAGS += -fno-strict-aliasing
 
+SPP_DRIVERS_DIR = $(BASE_OUTPUT)/src/drivers
+EXTRA_LDLIBS = -L$(SPP_DRIVERS_DIR)/vhost --whole-archive -lrte_pmd_spp_vhost --no-whole-archive
+
 include $(RTE_SDK)/mk/rte.extapp.mk
diff --git a/src/shared/common.h b/src/shared/common.h
index 9c46a64..431ad3e 100644
--- a/src/shared/common.h
+++ b/src/shared/common.h
@@ -34,7 +34,7 @@
 
 #define VDEV_ETH_RING "eth_ring"
 #define VDEV_NET_RING "net_ring"
-#define VDEV_ETH_VHOST "eth_vhost"
+#define VDEV_ETH_VHOST "spp_vhost"
 #define VDEV_NET_VHOST "net_vhost"
 #define VDEV_PCAP "net_pcap"
 #define VDEV_ETH_TAP "eth_tap"
diff --git a/src/shared/secondary/add_port.h b/src/shared/secondary/add_port.h
index cfae1af..a75b28b 100644
--- a/src/shared/secondary/add_port.h
+++ b/src/shared/secondary/add_port.h
@@ -10,7 +10,7 @@
 #define NR_DESCS 128
 
 #define VHOST_IFACE_NAME "/tmp/sock%u"
-#define VHOST_BACKEND_NAME "eth_vhost%u"
+#define VHOST_BACKEND_NAME "spp_vhost%u"
 
 #define PCAP_PMD_DEV_NAME "eth_pcap%u"
 #define NULL_PMD_DEV_NAME "eth_null%u"
diff --git a/src/vf/Makefile b/src/vf/Makefile
index 43e5e4d..e42f8b7 100644
--- a/src/vf/Makefile
+++ b/src/vf/Makefile
@@ -48,4 +48,7 @@ LDLIBS += -lrte_pmd_ring
 LDLIBS += -lrte_pmd_vhost
 endif
 
+SPP_DRIVERS_DIR = $(BASE_OUTPUT)/src/drivers
+EXTRA_LDLIBS = -L$(SPP_DRIVERS_DIR)/vhost --whole-archive -lrte_pmd_spp_vhost --no-whole-archive
+
 include $(RTE_SDK)/mk/rte.extapp.mk
-- 
2.17.1