| Message ID | 20201020115929.17248-1-david.marchand@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev] netdev-dpdk: Fix build with 20.11-rc1. | expand |
On Tue, Oct 20, 2020 at 2:01 PM David Marchand <david.marchand@redhat.com> wrote: > > Following changes to use a more sensitive terminology [1], the "master" > lcore is replaced with "main" lcore. > While at it, update a related comment. > > 1: https://git.dpdk.org/dpdk/commit/?id=be1f26504498 Rather: 1: https://git.dpdk.org/dpdk/commit/?id=cb056611a8ed I can respin if needed.
> On Tue, Oct 20, 2020 at 2:01 PM David Marchand > <david.marchand@redhat.com> wrote: > > > > Following changes to use a more sensitive terminology [1], the "master" > > lcore is replaced with "main" lcore. > > While at it, update a related comment. > > > > 1: https://git.dpdk.org/dpdk/commit/?id=be1f26504498 > > Rather: > 1: https://git.dpdk.org/dpdk/commit/?id=cb056611a8ed > > I can respin if needed. No need I can, an change before commit. Thanks Ian > > > -- > David Marchand
On 20/10/2020 13:08, David Marchand wrote: > On Tue, Oct 20, 2020 at 2:01 PM David Marchand > <david.marchand@redhat.com> wrote: >> >> Following changes to use a more sensitive terminology [1], the "master" >> lcore is replaced with "main" lcore. >> While at it, update a related comment. >> >> 1: https://git.dpdk.org/dpdk/commit/?id=be1f26504498 > > Rather: > 1: https://git.dpdk.org/dpdk/commit/?id=cb056611a8ed > > I can respin if needed. > > Acked-by: Kevin Traynor <ktraynor@redhat.com>
> On 20/10/2020 13:08, David Marchand wrote: > > On Tue, Oct 20, 2020 at 2:01 PM David Marchand > > <david.marchand@redhat.com> wrote: > >> > >> Following changes to use a more sensitive terminology [1], the "master" > >> lcore is replaced with "main" lcore. > >> While at it, update a related comment. > >> > >> 1: https://git.dpdk.org/dpdk/commit/?id=be1f26504498 > > > > Rather: > > 1: https://git.dpdk.org/dpdk/commit/?id=cb056611a8ed > > > > I can respin if needed. > > > > > > Acked-by: Kevin Traynor <ktraynor@redhat.com> Thanks all, I've pushed this to dpdk-latest. Regards Ian
diff --git a/lib/dpdk.c b/lib/dpdk.c index 2f235a742c..319540394b 100644 --- a/lib/dpdk.c +++ b/lib/dpdk.c @@ -443,7 +443,7 @@ dpdk_init__(const struct smap *ovs_other_config) /** * NOTE: This is an unsophisticated mechanism for determining the DPDK - * lcore for the DPDK Master. + * main core. */ if (auto_determine) { const struct ovs_numa_info_core *core; diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c index aff022387c..a62a75b87a 100644 --- a/lib/netdev-dpdk.c +++ b/lib/netdev-dpdk.c @@ -1303,7 +1303,7 @@ static int vhost_common_construct(struct netdev *netdev) OVS_REQUIRES(dpdk_mutex) { - int socket_id = rte_lcore_to_socket_id(rte_get_master_lcore()); + int socket_id = rte_lcore_to_socket_id(rte_get_main_lcore()); struct netdev_dpdk *dev = netdev_dpdk_cast(netdev); dev->vhost_rxq_enabled = dpdk_rte_mzalloc(OVS_VHOST_MAX_QUEUE_NUM *
Following changes to use a more sensitive terminology [1], the "master" lcore is replaced with "main" lcore. While at it, update a related comment. 1: https://git.dpdk.org/dpdk/commit/?id=be1f26504498 Signed-off-by: David Marchand <david.marchand@redhat.com> --- lib/dpdk.c | 2 +- lib/netdev-dpdk.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)