[v2,1/3] examples/vhost: update makefile to match meson build system

Message ID 20220621121315.1173180-1-herakliusz.lipiec@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Maxime Coquelin
Headers
Series [v2,1/3] examples/vhost: update makefile to match meson build system |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-testing warning apply patch failure

Commit Message

Herakliusz Lipiec June 21, 2022, 12:13 p.m. UTC
  Meson build system creates a vhost binary but Makefile
and docs reference same as vhost-switch. Updating makefile
to match meson and the docs accordingly.

Signed-off-by: Herakliusz Lipiec <herakliusz.lipiec@intel.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
V2:
 * Moving relevant doc updates here from second patch as per
   Bruces suggestion.
---
 doc/guides/sample_app_ug/vhost.rst | 10 +++++-----
 examples/vhost/Makefile            |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
  

Comments

Chenbo Xia June 21, 2022, 1:12 p.m. UTC | #1
Hi Herakliusz,

> -----Original Message-----
> From: Lipiec, Herakliusz <herakliusz.lipiec@intel.com>
> Sent: Tuesday, June 21, 2022 8:13 PM
> To: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
> Richardson, Bruce <bruce.richardson@intel.com>
> Cc: dev@dpdk.org; Lipiec, Herakliusz <herakliusz.lipiec@intel.com>
> Subject: [PATCH v2 1/3] examples/vhost: update makefile to match meson
> build system
> 
> Meson build system creates a vhost binary but Makefile
> and docs reference same as vhost-switch. Updating makefile
> to match meson and the docs accordingly.
> 
> Signed-off-by: Herakliusz Lipiec <herakliusz.lipiec@intel.com>
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
> V2:
>  * Moving relevant doc updates here from second patch as per
>    Bruces suggestion.
> ---
>  doc/guides/sample_app_ug/vhost.rst | 10 +++++-----
>  examples/vhost/Makefile            |  2 +-
>  2 files changed, 6 insertions(+), 6 deletions(-)

This patchset seems to have apply failure, please have a check.

Thanks,
Chenbo

> 
> diff --git a/doc/guides/sample_app_ug/vhost.rst
> b/doc/guides/sample_app_ug/vhost.rst
> index a6ce4bc8ac..3c3cfdcd2d 100644
> --- a/doc/guides/sample_app_ug/vhost.rst
> +++ b/doc/guides/sample_app_ug/vhost.rst
> @@ -17,10 +17,10 @@ Testing steps
>  -------------
> 
>  This section shows the steps how to test a typical PVP case with this
> -vhost-switch sample, whereas packets are received from the physical NIC
> +dpdk-vhost sample, whereas packets are received from the physical NIC
>  port first and enqueued to the VM's Rx queue. Through the guest testpmd's
>  default forwarding mode (io forward), those packets will be put into
> -the Tx queue. The vhost-switch example, in turn, gets the packets and
> +the Tx queue. The dpdk-vhost example, in turn, gets the packets and
>  puts back to the same physical NIC port.
> 
>  Build
> @@ -38,7 +38,7 @@ Start the vswitch example
> 
>  .. code-block:: console
> 
> -        ./dpdk-vhost-switch -l 0-3 -n 4 --socket-mem 1024  \
> +        ./dpdk-vhost -l 0-3 -n 4 --socket-mem 1024  \
>               -- --socket-file /tmp/sock0 --client \
>               ...
> 
> @@ -90,10 +90,10 @@ Then start testpmd for packet forwarding testing.
>  Inject packets
>  --------------
> 
> -While a virtio-net is connected to vhost-switch, a VLAN tag starts with
> +While a virtio-net is connected to dpdk-vhost, a VLAN tag starts with
>  1000 is assigned to it. So make sure configure your packet generator
>  with the right MAC and VLAN tag, you should be able to see following
> -log from the vhost-switch console. It means you get it work::
> +log from the dpdk-vhost console. It means you get it work::
> 
>      VHOST_DATA: (0) mac 52:54:00:00:00:14 and vlan 1000 registered
> 
> diff --git a/examples/vhost/Makefile b/examples/vhost/Makefile
> index 975a5dfe40..ea64f02bb0 100644
> --- a/examples/vhost/Makefile
> +++ b/examples/vhost/Makefile
> @@ -2,7 +2,7 @@
>  # Copyright(c) 2010-2014 Intel Corporation
> 
>  # binary name
> -APP = vhost-switch
> +APP = dpdk-vhost
> 
>  # all source are stored in SRCS-y
>  SRCS-y := main.c virtio_net.c
> --
> 2.36.1
  

Patch

diff --git a/doc/guides/sample_app_ug/vhost.rst b/doc/guides/sample_app_ug/vhost.rst
index a6ce4bc8ac..3c3cfdcd2d 100644
--- a/doc/guides/sample_app_ug/vhost.rst
+++ b/doc/guides/sample_app_ug/vhost.rst
@@ -17,10 +17,10 @@  Testing steps
 -------------
 
 This section shows the steps how to test a typical PVP case with this
-vhost-switch sample, whereas packets are received from the physical NIC
+dpdk-vhost sample, whereas packets are received from the physical NIC
 port first and enqueued to the VM's Rx queue. Through the guest testpmd's
 default forwarding mode (io forward), those packets will be put into
-the Tx queue. The vhost-switch example, in turn, gets the packets and
+the Tx queue. The dpdk-vhost example, in turn, gets the packets and
 puts back to the same physical NIC port.
 
 Build
@@ -38,7 +38,7 @@  Start the vswitch example
 
 .. code-block:: console
 
-        ./dpdk-vhost-switch -l 0-3 -n 4 --socket-mem 1024  \
+        ./dpdk-vhost -l 0-3 -n 4 --socket-mem 1024  \
              -- --socket-file /tmp/sock0 --client \
              ...
 
@@ -90,10 +90,10 @@  Then start testpmd for packet forwarding testing.
 Inject packets
 --------------
 
-While a virtio-net is connected to vhost-switch, a VLAN tag starts with
+While a virtio-net is connected to dpdk-vhost, a VLAN tag starts with
 1000 is assigned to it. So make sure configure your packet generator
 with the right MAC and VLAN tag, you should be able to see following
-log from the vhost-switch console. It means you get it work::
+log from the dpdk-vhost console. It means you get it work::
 
     VHOST_DATA: (0) mac 52:54:00:00:00:14 and vlan 1000 registered
 
diff --git a/examples/vhost/Makefile b/examples/vhost/Makefile
index 975a5dfe40..ea64f02bb0 100644
--- a/examples/vhost/Makefile
+++ b/examples/vhost/Makefile
@@ -2,7 +2,7 @@ 
 # Copyright(c) 2010-2014 Intel Corporation
 
 # binary name
-APP = vhost-switch
+APP = dpdk-vhost
 
 # all source are stored in SRCS-y
 SRCS-y := main.c virtio_net.c