> -----Original Message----- > From: Ben Pfaff [mailto:b...@nicira.com] > Sent: Thursday, July 23, 2015 14:36 > To: Mussar, Gary > Cc: dev@openvswitch.org > Subject: Re: [ovs-dev] [PATCH V3 1/1] Fix detection of vhost_cuse in dpdk > rte_config.h > > On Thu, Jul 23, 2015 at 01:48:53PM -0400, Gary Mussar wrote: > > 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 <gmus...@ciena.com> > > --- > > acinclude.m4 | 6 +++++- > > 1 file changed, 5 insertions(+), 1 deletion(-) > > > > diff --git a/acinclude.m4 b/acinclude.m4 index 3604e55..45cfaf6 100644 > > --- a/acinclude.m4 > > +++ b/acinclude.m4 > > @@ -175,7 +175,11 @@ AC_DEFUN([OVS_CHECK_DPDK], [ > > DPDK_LIB="-lintel_dpdk" > > DPDK_EXTRA_LIB="" > > > > - OVS_GREP_IFELSE([$RTE_SDK/include/rte_config.h], [define > RTE_LIBRTE_VHOST_USER 1], > > + AC_COMPILE_IFELSE( > > + [AC_LANG_PROGRAM([#include <$RTE_SDK/include/rte_config.h> #if > > +!RTE_LIBRTE_VHOST_USER #error #endif], [])], > > [], [AC_DEFINE([VHOST_CUSE], [1], [DPDK vhost-cuse > support enabled, vhost-user disabled.]) > > DPDK_EXTRA_LIB="-lfuse"]) > > As long as it works (I presume you tested it), it looks good to me from an > Autoconf perspective. I'll leave it to Pravin for review and to apply it.
Yes, I have successfully compiled both a VHOST_CUSE and VHOST_USER configuration with this change. Gary > > Thanks, > > Ben. _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
