[dpdk-dev] [PATCH 2/6] net/xenvirt: remove
Bruce Richardson
bruce.richardson at intel.com
Mon Sep 4 16:50:22 CEST 2017
On Mon, Sep 04, 2017 at 03:25:48PM +0100, Bruce Richardson wrote:
> On Wed, Aug 30, 2017 at 06:10:30PM +0000, Jianfeng Tan wrote:
> > Signed-off-by: Jianfeng Tan <jianfeng.tan at intel.com>
> > ---
> > MAINTAINERS | 2 -
> > app/test-pmd/Makefile | 4 -
> > app/test-pmd/testpmd.c | 12 -
> > config/common_base | 5 -
> > config/defconfig_arm-armv7a-linuxapp-gcc | 1 -
> > doc/guides/nics/features/xenvirt.ini | 6 -
> > drivers/net/Makefile | 2 -
> > drivers/net/xenvirt/Makefile | 57 --
> > drivers/net/xenvirt/rte_eth_xenvirt.c | 766 ------------------------
> > drivers/net/xenvirt/rte_eth_xenvirt.h | 61 --
> > drivers/net/xenvirt/rte_eth_xenvirt_version.map | 7 -
> > drivers/net/xenvirt/rte_mempool_gntalloc.c | 295 ---------
> > drivers/net/xenvirt/rte_xen_lib.c | 454 --------------
> > drivers/net/xenvirt/rte_xen_lib.h | 116 ----
> > drivers/net/xenvirt/virtio_logs.h | 70 ---
> > drivers/net/xenvirt/virtqueue.h | 273 ---------
> > mk/rte.app.mk | 1 -
> > pkg/dpdk.spec | 3 -
> > 18 files changed, 2135 deletions(-)
> > delete mode 100644 doc/guides/nics/features/xenvirt.ini
> > delete mode 100644 drivers/net/xenvirt/Makefile
> > delete mode 100644 drivers/net/xenvirt/rte_eth_xenvirt.c
> > delete mode 100644 drivers/net/xenvirt/rte_eth_xenvirt.h
> > delete mode 100644 drivers/net/xenvirt/rte_eth_xenvirt_version.map
> > delete mode 100644 drivers/net/xenvirt/rte_mempool_gntalloc.c
> > delete mode 100644 drivers/net/xenvirt/rte_xen_lib.c
> > delete mode 100644 drivers/net/xenvirt/rte_xen_lib.h
> > delete mode 100644 drivers/net/xenvirt/virtio_logs.h
> > delete mode 100644 drivers/net/xenvirt/virtqueue.h
> >
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index fe6c6db..003e72e 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -194,9 +194,7 @@ M: Jianfeng Tan <jianfeng.tan at intel.com>
> > F: lib/librte_eal/linuxapp/xen_dom0/
> > F: lib/librte_eal/linuxapp/eal/*xen*
> > F: lib/librte_eal/linuxapp/eal/include/exec-env/rte_dom0_common.h
> > -F: drivers/net/xenvirt/
> > F: doc/guides/xen/
> > -F: doc/guides/nics/features/xenvirt.ini
> >
> > FreeBSD EAL (with overlaps)
> > M: Bruce Richardson <bruce.richardson at intel.com>
> > diff --git a/app/test-pmd/Makefile b/app/test-pmd/Makefile
> > index c36be19..b6e80dd 100644
> > --- a/app/test-pmd/Makefile
> > +++ b/app/test-pmd/Makefile
> > @@ -77,10 +77,6 @@ ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD),y)
> > LDLIBS += -lrte_pmd_bnxt
> > endif
> >
> > -ifeq ($(CONFIG_RTE_LIBRTE_PMD_XENVIRT),y)
> > -LDLIBS += -lrte_pmd_xenvirt
> > -endif
> > -
> > endif
> >
> > CFLAGS_cmdline.o := -D_GNU_SOURCE
> > diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
> > index 7d40139..f8d02ae 100644
> > --- a/app/test-pmd/testpmd.c
> > +++ b/app/test-pmd/testpmd.c
> > @@ -76,9 +76,6 @@
> > #ifdef RTE_LIBRTE_IXGBE_PMD
> > #include <rte_pmd_ixgbe.h>
> > #endif
> > -#ifdef RTE_LIBRTE_PMD_XENVIRT
> > -#include <rte_eth_xenvirt.h>
> > -#endif
> > #ifdef RTE_LIBRTE_PDUMP
> > #include <rte_pdump.h>
> > #endif
> > @@ -497,15 +494,6 @@ mbuf_pool_create(uint16_t mbuf_seg_size, unsigned nb_mbuf,
> > "create a new mbuf pool <%s>: n=%u, size=%u, socket=%u\n",
> > pool_name, nb_mbuf, mbuf_seg_size, socket_id);
> >
> > -#ifdef RTE_LIBRTE_PMD_XENVIRT
> > - rte_mp = rte_mempool_gntalloc_create(pool_name, nb_mbuf, mb_size,
> > - (unsigned) mb_mempool_cache,
> > - sizeof(struct rte_pktmbuf_pool_private),
> > - rte_pktmbuf_pool_init, NULL,
> > - rte_pktmbuf_init, NULL,
> > - socket_id, 0);
> > -#endif
> > -
> > /* if the former XEN allocation failed fall back to normal allocation */
> > if (rte_mp == NULL) {
>
> Remove comment and if condition, as there is no way the the variable can
> be non-null now.
>
With this change:
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
More information about the dev
mailing list