From: Bruce Richardson <bruce.richardson@intel.com>
To: Cheng Jiang <Cheng1.jiang@intel.com>
Cc: maxime.coquelin@redhat.com, chenbo.xia@intel.com, dev@dpdk.org,
patrick.fu@intel.com, YvonneX.Yang@intel.com,
david.marchand@redhat.com, Jiayu.Hu@intel.com
Subject: Re: [dpdk-dev] [PATCH v4] examples/vhost: fix ioat dependency issue
Date: Thu, 12 Nov 2020 15:01:35 +0000 [thread overview]
Message-ID: <20201112150135.GK1309@bricha3-MOBL.ger.corp.intel.com> (raw)
In-Reply-To: <20201112134754.96530-1-Cheng1.jiang@intel.com>
On Thu, Nov 12, 2020 at 01:47:54PM +0000, Cheng Jiang wrote:
> Fix vhost-switch compiling issue when ioat dependency is missing.
> Change 'RTE_x86' check into 'RTE_RAW_IOAT' check in meson build file.
> Use 'RTE_RAW_IOAT' to control conditional compiling in source file.
> Clean some codes.
>
> Fixes: abec60e7115d ("examples/vhost: support vhost async data path")
> Fixes: 3a04ecb21420 ("examples/vhost: add async vhost args parsing")
>
> Signed-off-by: Cheng Jiang <Cheng1.jiang@intel.com>
> ---
> v4:
> * Use macros in ioat.c for conditional compilation instead of changing Makefile.
>
> v3:
> * Added fixes lines in commit log.
>
> v2:
> * Cleaned some codes
> * Changed RTE_RAW_IOAT check method in Makefile
> * Added ioat function definition when RTE_RAW_IOAT is missing
>
> examples/vhost/Makefile | 2 +-
> examples/vhost/ioat.c | 6 ++++++
> examples/vhost/ioat.h | 32 +++++++++++++++++++++++++-------
> examples/vhost/main.c | 22 +++++++++++-----------
> examples/vhost/meson.build | 2 +-
> 5 files changed, 44 insertions(+), 20 deletions(-)
>
> diff --git a/examples/vhost/Makefile b/examples/vhost/Makefile
> index cec59d0e0..8c969caaa 100644
> --- a/examples/vhost/Makefile
> +++ b/examples/vhost/Makefile
> @@ -5,7 +5,7 @@
> APP = vhost-switch
>
> # all source are stored in SRCS-y
> -SRCS-y := main.c virtio_net.c
> +SRCS-y := main.c virtio_net.c ioat.c
>
> # Build using pkg-config variables if possible
> ifneq ($(shell pkg-config --exists libdpdk && echo 0),0)
> diff --git a/examples/vhost/ioat.c b/examples/vhost/ioat.c
> index b2c74f653..6f87d7bba 100644
> --- a/examples/vhost/ioat.c
> +++ b/examples/vhost/ioat.c
> @@ -1,13 +1,17 @@
> /* SPDX-License-Identifier: BSD-3-Clause
> * Copyright(c) 2010-2020 Intel Corporation
> */
> +#ifdef RTE_RAW_IOAT
> #include <rte_rawdev.h>
> #include <rte_ioat_rawdev.h>
> +#endif /* RTE_RAW_IOAT */
> #include <sys/uio.h>
>
> #include "ioat.h"
> #include "main.h"
>
> +#ifdef RTE_RAW_IOAT
> +
Minor nit is that we generally include system header files before DPDK
headers. Following that policy, we can move sys/uio.h up to be before the
first #ifdef, and then we can just merge the two #ifdefs together to just
have one at the start and one at the end.
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
next prev parent reply other threads:[~2020-11-12 15:02 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-11 11:19 [dpdk-dev] [PATCH v1] " Cheng Jiang
2020-11-11 14:36 ` David Marchand
2020-11-11 15:03 ` Bruce Richardson
2020-11-12 7:14 ` Jiang, Cheng1
2020-11-12 9:31 ` Bruce Richardson
2020-11-12 9:39 ` David Marchand
2020-11-12 10:22 ` Bruce Richardson
2020-11-12 5:16 ` [dpdk-dev] [PATCH v2] " Cheng Jiang
2020-11-12 7:21 ` [dpdk-dev] [PATCH v3] " Cheng Jiang
2020-11-12 9:36 ` David Marchand
2020-11-12 10:28 ` Bruce Richardson
2020-11-12 11:29 ` Jiang, Cheng1
2020-11-12 12:02 ` Bruce Richardson
2020-11-12 14:06 ` Jiang, Cheng1
2020-11-12 13:47 ` [dpdk-dev] [PATCH v4] " Cheng Jiang
2020-11-12 15:01 ` Bruce Richardson [this message]
2020-11-12 15:55 ` Jiang, Cheng1
2020-11-12 15:49 ` [dpdk-dev] [PATCH v5] " Cheng Jiang
2020-11-12 16:01 ` Bruce Richardson
2020-11-12 16:51 ` Maxime Coquelin
2020-11-12 18:18 ` David Marchand
2020-11-13 8:40 ` Maxime Coquelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201112150135.GK1309@bricha3-MOBL.ger.corp.intel.com \
--to=bruce.richardson@intel.com \
--cc=Cheng1.jiang@intel.com \
--cc=Jiayu.Hu@intel.com \
--cc=YvonneX.Yang@intel.com \
--cc=chenbo.xia@intel.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=maxime.coquelin@redhat.com \
--cc=patrick.fu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).