From 09452c07edc1b5926a5acc41ed2f125b66785ba5 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 15 May 2015 16:56:59 +0100 Subject: [PATCH] vmxnet3: move to drivers/net/ Move vmxnet3 PMD to drivers/net directory. As part of the move, rename the "vmxnet3" subdirectory, containing the original FreeBSD drivers, from "vmxnet3" to the more standard name "base", to indicate it contains the base drivers used for the implementation. Signed-off-by: Bruce Richardson Acked-by: John McNamara Acked-by: Thomas Monjalon --- MAINTAINERS | 2 +- doc/guides/prog_guide/source_org.rst | 2 +- drivers/net/Makefile | 1 + {lib/librte_pmd_vmxnet3 => drivers/net/vmxnet3}/Makefile | 4 ++-- .../vmxnet3 => drivers/net/vmxnet3/base}/README | 0 .../vmxnet3 => drivers/net/vmxnet3/base}/includeCheck.h | 0 .../vmxnet3 => drivers/net/vmxnet3/base}/upt1_defs.h | 0 .../vmxnet3 => drivers/net/vmxnet3/base}/vmware_pack_begin.h | 0 .../vmxnet3 => drivers/net/vmxnet3/base}/vmware_pack_end.h | 0 .../vmxnet3 => drivers/net/vmxnet3/base}/vmxnet3_defs.h | 0 .../vmxnet3 => drivers/net/vmxnet3/base}/vmxnet3_osdep.h | 0 .../net/vmxnet3}/rte_pmd_vmxnet3_version.map | 0 .../net/vmxnet3}/vmxnet3_ethdev.c | 4 ++-- .../net/vmxnet3}/vmxnet3_ethdev.h | 0 .../librte_pmd_vmxnet3 => drivers/net/vmxnet3}/vmxnet3_logs.h | 0 .../librte_pmd_vmxnet3 => drivers/net/vmxnet3}/vmxnet3_ring.h | 0 .../librte_pmd_vmxnet3 => drivers/net/vmxnet3}/vmxnet3_rxtx.c | 4 ++-- lib/Makefile | 1 - 18 files changed, 9 insertions(+), 9 deletions(-) rename {lib/librte_pmd_vmxnet3 => drivers/net/vmxnet3}/Makefile (96%) rename {lib/librte_pmd_vmxnet3/vmxnet3 => drivers/net/vmxnet3/base}/README (100%) rename {lib/librte_pmd_vmxnet3/vmxnet3 => drivers/net/vmxnet3/base}/includeCheck.h (100%) rename {lib/librte_pmd_vmxnet3/vmxnet3 => drivers/net/vmxnet3/base}/upt1_defs.h (100%) rename {lib/librte_pmd_vmxnet3/vmxnet3 => drivers/net/vmxnet3/base}/vmware_pack_begin.h (100%) rename {lib/librte_pmd_vmxnet3/vmxnet3 => drivers/net/vmxnet3/base}/vmware_pack_end.h (100%) rename {lib/librte_pmd_vmxnet3/vmxnet3 => drivers/net/vmxnet3/base}/vmxnet3_defs.h (100%) rename {lib/librte_pmd_vmxnet3/vmxnet3 => drivers/net/vmxnet3/base}/vmxnet3_osdep.h (100%) rename {lib/librte_pmd_vmxnet3 => drivers/net/vmxnet3}/rte_pmd_vmxnet3_version.map (100%) rename {lib/librte_pmd_vmxnet3 => drivers/net/vmxnet3}/vmxnet3_ethdev.c (99%) rename {lib/librte_pmd_vmxnet3 => drivers/net/vmxnet3}/vmxnet3_ethdev.h (100%) rename {lib/librte_pmd_vmxnet3 => drivers/net/vmxnet3}/vmxnet3_logs.h (100%) rename {lib/librte_pmd_vmxnet3 => drivers/net/vmxnet3}/vmxnet3_ring.h (100%) rename {lib/librte_pmd_vmxnet3 => drivers/net/vmxnet3}/vmxnet3_rxtx.c (99%) diff --git a/MAINTAINERS b/MAINTAINERS index c75ef519e3..7b8cb2349d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -250,7 +250,7 @@ F: doc/guides/sample_app_ug/vhost.rst VMware vmxnet3 M: Yong Wang -F: lib/librte_pmd_vmxnet3/ +F: drivers/net/vmxnet3/ F: doc/guides/nics/vmxnet3.rst PCAP PMD diff --git a/doc/guides/prog_guide/source_org.rst b/doc/guides/prog_guide/source_org.rst index 394de018b8..b3413f0aaa 100644 --- a/doc/guides/prog_guide/source_org.rst +++ b/doc/guides/prog_guide/source_org.rst @@ -79,7 +79,6 @@ The lib directory contains:: +-- librte_mempool # memory pool manager (fixedsized objects) +-- librte_meter # QoS metering library +-- librte_net # various IP-related headers - +-- librte_pmd_vmxnet3 # VMXNET3 poll mode driver +-- librte_pmd_xenvirt # Xen virtio poll mode driver +-- librte_power # power management library +-- librte_ring # software rings (act as lockless FIFOs) @@ -109,6 +108,7 @@ The drivers directory has a net subdirectory which contains:: +-- pcap # PCAP poll mode driver +-- ring # ring poll mode driver +-- virtio # virtio poll mode driver + +-- vmxnet3 # VMXNET3 poll mode driver Applications ------------ diff --git a/drivers/net/Makefile b/drivers/net/Makefile index ec32e5251c..7763845e66 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -43,6 +43,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_PMD_NULL) += null DIRS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += pcap DIRS-$(CONFIG_RTE_LIBRTE_PMD_RING) += ring DIRS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio +DIRS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += vmxnet3 include $(RTE_SDK)/mk/rte.sharelib.mk include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/lib/librte_pmd_vmxnet3/Makefile b/drivers/net/vmxnet3/Makefile similarity index 96% rename from lib/librte_pmd_vmxnet3/Makefile rename to drivers/net/vmxnet3/Makefile index 48177a382f..901cee18e4 100644 --- a/lib/librte_pmd_vmxnet3/Makefile +++ b/drivers/net/vmxnet3/Makefile @@ -1,6 +1,6 @@ # BSD LICENSE # -# Copyright(c) 2010-2014 Intel Corporation. All rights reserved. +# Copyright(c) 2010-2015 Intel Corporation. All rights reserved. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -64,7 +64,7 @@ CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args endif -VPATH += $(SRCDIR)/vmxnet3 +VPATH += $(SRCDIR)/base EXPORT_MAP := rte_pmd_vmxnet3_version.map diff --git a/lib/librte_pmd_vmxnet3/vmxnet3/README b/drivers/net/vmxnet3/base/README similarity index 100% rename from lib/librte_pmd_vmxnet3/vmxnet3/README rename to drivers/net/vmxnet3/base/README diff --git a/lib/librte_pmd_vmxnet3/vmxnet3/includeCheck.h b/drivers/net/vmxnet3/base/includeCheck.h similarity index 100% rename from lib/librte_pmd_vmxnet3/vmxnet3/includeCheck.h rename to drivers/net/vmxnet3/base/includeCheck.h diff --git a/lib/librte_pmd_vmxnet3/vmxnet3/upt1_defs.h b/drivers/net/vmxnet3/base/upt1_defs.h similarity index 100% rename from lib/librte_pmd_vmxnet3/vmxnet3/upt1_defs.h rename to drivers/net/vmxnet3/base/upt1_defs.h diff --git a/lib/librte_pmd_vmxnet3/vmxnet3/vmware_pack_begin.h b/drivers/net/vmxnet3/base/vmware_pack_begin.h similarity index 100% rename from lib/librte_pmd_vmxnet3/vmxnet3/vmware_pack_begin.h rename to drivers/net/vmxnet3/base/vmware_pack_begin.h diff --git a/lib/librte_pmd_vmxnet3/vmxnet3/vmware_pack_end.h b/drivers/net/vmxnet3/base/vmware_pack_end.h similarity index 100% rename from lib/librte_pmd_vmxnet3/vmxnet3/vmware_pack_end.h rename to drivers/net/vmxnet3/base/vmware_pack_end.h diff --git a/lib/librte_pmd_vmxnet3/vmxnet3/vmxnet3_defs.h b/drivers/net/vmxnet3/base/vmxnet3_defs.h similarity index 100% rename from lib/librte_pmd_vmxnet3/vmxnet3/vmxnet3_defs.h rename to drivers/net/vmxnet3/base/vmxnet3_defs.h diff --git a/lib/librte_pmd_vmxnet3/vmxnet3/vmxnet3_osdep.h b/drivers/net/vmxnet3/base/vmxnet3_osdep.h similarity index 100% rename from lib/librte_pmd_vmxnet3/vmxnet3/vmxnet3_osdep.h rename to drivers/net/vmxnet3/base/vmxnet3_osdep.h diff --git a/lib/librte_pmd_vmxnet3/rte_pmd_vmxnet3_version.map b/drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map similarity index 100% rename from lib/librte_pmd_vmxnet3/rte_pmd_vmxnet3_version.map rename to drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map diff --git a/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c similarity index 99% rename from lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c rename to drivers/net/vmxnet3/vmxnet3_ethdev.c index 20f484ca25..1685ce4ed1 100644 --- a/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -1,7 +1,7 @@ /*- * BSD LICENSE * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. + * Copyright(c) 2010-2015 Intel Corporation. All rights reserved. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -61,7 +61,7 @@ #include #include -#include "vmxnet3/vmxnet3_defs.h" +#include "base/vmxnet3_defs.h" #include "vmxnet3_ring.h" #include "vmxnet3_logs.h" diff --git a/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.h b/drivers/net/vmxnet3/vmxnet3_ethdev.h similarity index 100% rename from lib/librte_pmd_vmxnet3/vmxnet3_ethdev.h rename to drivers/net/vmxnet3/vmxnet3_ethdev.h diff --git a/lib/librte_pmd_vmxnet3/vmxnet3_logs.h b/drivers/net/vmxnet3/vmxnet3_logs.h similarity index 100% rename from lib/librte_pmd_vmxnet3/vmxnet3_logs.h rename to drivers/net/vmxnet3/vmxnet3_logs.h diff --git a/lib/librte_pmd_vmxnet3/vmxnet3_ring.h b/drivers/net/vmxnet3/vmxnet3_ring.h similarity index 100% rename from lib/librte_pmd_vmxnet3/vmxnet3_ring.h rename to drivers/net/vmxnet3/vmxnet3_ring.h diff --git a/lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c similarity index 99% rename from lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c rename to drivers/net/vmxnet3/vmxnet3_rxtx.c index d8019f53ee..a1eac4573f 100644 --- a/lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c +++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c @@ -1,7 +1,7 @@ /*- * BSD LICENSE * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. + * Copyright(c) 2010-2015 Intel Corporation. All rights reserved. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -71,7 +71,7 @@ #include #include -#include "vmxnet3/vmxnet3_defs.h" +#include "base/vmxnet3_defs.h" #include "vmxnet3_ring.h" #include "vmxnet3_logs.h" diff --git a/lib/Makefile b/lib/Makefile index 3e5cab09ac..81cf0c1e20 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -41,7 +41,6 @@ DIRS-$(CONFIG_RTE_LIBRTE_TIMER) += librte_timer DIRS-$(CONFIG_RTE_LIBRTE_CFGFILE) += librte_cfgfile DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += librte_cmdline DIRS-$(CONFIG_RTE_LIBRTE_ETHER) += librte_ether -DIRS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += librte_pmd_vmxnet3 DIRS-$(CONFIG_RTE_LIBRTE_PMD_XENVIRT) += librte_pmd_xenvirt DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += librte_vhost DIRS-$(CONFIG_RTE_LIBRTE_HASH) += librte_hash -- 2.20.1