Thanks, applied to master and branch-2.6

2016-08-18 7:01 GMT-07:00 Stokes, Ian <ian.sto...@intel.com>:

>
> > If NUMA information can't be derived from a vHost User device, only print
> > an error if the VHOST_NUMA option is enabled in DPDK. Otherwise 'fail'
> > silently.
> >
> > Fixes: 0a0f39df1d5a ("netdev-dpdk: Add support for DPDK 16.07")
> > Signed-off-by: Ciara Loftus <ciara.lof...@intel.com>
> > Reported-by: Ian Stokes <ian.sto...@intel.com>
> > ---
> >  acinclude.m4      | 3 ++-
> >  lib/netdev-dpdk.c | 2 ++
> >  2 files changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/acinclude.m4 b/acinclude.m4 index 5a6dca7..1b05f8d 100644
> > --- a/acinclude.m4
> > +++ b/acinclude.m4
> > @@ -207,7 +207,8 @@ AC_DEFUN([OVS_CHECK_DPDK], [
> >          ], [])
> >        ], [],
> >        [AC_SEARCH_LIBS([get_mempolicy],[numa],[],[AC_MSG_ERROR([unable
> to
> > find libnuma, install the dependency package])])
> > -       DPDK_EXTRA_LIB="-lnuma"])
> > +       DPDK_EXTRA_LIB="-lnuma"
> > +       AC_DEFINE([VHOST_NUMA], [1], [NUMA Aware vHost support detected
> > + in DPDK.])])
> >
> >      AC_COMPILE_IFELSE([
> >        AC_LANG_PROGRAM(
> > diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c index e5f2cdd..f7e844d
> > 100644
> > --- a/lib/netdev-dpdk.c
> > +++ b/lib/netdev-dpdk.c
> > @@ -2357,8 +2357,10 @@ new_device(int vid)
> >              /* Get NUMA information */
> >              newnode = rte_vhost_get_numa_node(vid);
> >              if (newnode == -1) {
> > +#ifdef VHOST_NUMA
> >                  VLOG_INFO("Error getting NUMA info for vHost Device
> > '%s'",
> >                            ifname);
> > +#endif
> >                  newnode = dev->socket_id;
> >              }
> >
> > --
>
> Thanks for the patch Ciara.
>
> Tested-by: Ian Stokes <ian.sto...@intel.com>
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev
>
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev

Reply via email to