From 378af564556dafeeeb7e44e588538a9059dae661 Mon Sep 17 00:00:00 2001 From: Gary Mussar Date: Thu, 23 Jul 2015 10:48:53 -0700 Subject: [PATCH] dpdk: Fix detection of vhost_cuse in dpdk rte_config.h Dpdk allows users to create a config that includes other config files and then override values. Eg. defconfig_x86_64-native_vhost_cuse-linuxapp-gcc: CONFIG_RTE_BUILD_COMBINE_LIBS=y CONFIG_RTE_BUILD_SHARED_LIB=n CONFIG_RTE_LIBRTE_VHOST=y CONFIG_RTE_LIBRTE_VHOST_USER=n This allows you to have both a vhostuser and vhostcuse config in the same source tree without the need to replicate everything in those config files just to change a couple of settings. The resultant .config file has all of the settings from the included files with the updated settings at the end. The resultant rte_config.h contains multiple undefs and defines for the overridden settings. Eg. > grep RTE_LIBRTE_VHOST_USER x86_64-native_vhost_cuse-linuxapp-gcc/include/rte_config.h #undef RTE_LIBRTE_VHOST_USER #define RTE_LIBRTE_VHOST_USER 1 #undef RTE_LIBRTE_VHOST_USER The current mechanism to detect the RTE_LIBRTE_VHOST_USER setting merely greps the rte_config.h file for the string "define RTE_LIBRTE_VHOST_USER 1" rather than the final setting of RTE_LIBRTE_VHOST_USER. The following patch changes this test to detect the final setting of RTE_LIBRTE_VHOST_USER. Signed-off-by: Gary Mussar Acked-by: Pravin B Shelar +#if !RTE_LIBRTE_VHOST_USER +#error +#endif], [])], [], [AC_DEFINE([VHOST_CUSE], [1], [DPDK vhost-cuse support enabled, vhost-user disabled.]) DPDK_EXTRA_LIB="-lfuse"]) -- 2.20.1