From 6c3169a3dc041cbdbef506f19e3779940caa4b29 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 15 May 2015 16:56:58 +0100 Subject: [PATCH] virtio: move to drivers/net/ Move virtio PMD to drivers/net directory 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_virtio => drivers/net/virtio}/Makefile | 0 .../net/virtio}/rte_pmd_virtio_version.map | 0 {lib/librte_pmd_virtio => drivers/net/virtio}/virtio_ethdev.c | 0 {lib/librte_pmd_virtio => drivers/net/virtio}/virtio_ethdev.h | 0 {lib/librte_pmd_virtio => drivers/net/virtio}/virtio_logs.h | 0 {lib/librte_pmd_virtio => drivers/net/virtio}/virtio_pci.c | 0 {lib/librte_pmd_virtio => drivers/net/virtio}/virtio_pci.h | 0 {lib/librte_pmd_virtio => drivers/net/virtio}/virtio_ring.h | 0 {lib/librte_pmd_virtio => drivers/net/virtio}/virtio_rxtx.c | 0 {lib/librte_pmd_virtio => drivers/net/virtio}/virtqueue.c | 0 {lib/librte_pmd_virtio => drivers/net/virtio}/virtqueue.h | 0 lib/Makefile | 1 - 15 files changed, 3 insertions(+), 3 deletions(-) rename {lib/librte_pmd_virtio => drivers/net/virtio}/Makefile (100%) rename {lib/librte_pmd_virtio => drivers/net/virtio}/rte_pmd_virtio_version.map (100%) rename {lib/librte_pmd_virtio => drivers/net/virtio}/virtio_ethdev.c (100%) rename {lib/librte_pmd_virtio => drivers/net/virtio}/virtio_ethdev.h (100%) rename {lib/librte_pmd_virtio => drivers/net/virtio}/virtio_logs.h (100%) rename {lib/librte_pmd_virtio => drivers/net/virtio}/virtio_pci.c (100%) rename {lib/librte_pmd_virtio => drivers/net/virtio}/virtio_pci.h (100%) rename {lib/librte_pmd_virtio => drivers/net/virtio}/virtio_ring.h (100%) rename {lib/librte_pmd_virtio => drivers/net/virtio}/virtio_rxtx.c (100%) rename {lib/librte_pmd_virtio => drivers/net/virtio}/virtqueue.c (100%) rename {lib/librte_pmd_virtio => drivers/net/virtio}/virtqueue.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index c2557bd648..c75ef519e3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -241,7 +241,7 @@ F: doc/guides/nics/mlx4.rst RedHat virtio M: Changchun Ouyang -F: lib/librte_pmd_virtio/ +F: drivers/net/virtio/ F: doc/guides/nics/virtio.rst F: lib/librte_vhost/ F: doc/guides/prog_guide/vhost_lib.rst diff --git a/doc/guides/prog_guide/source_org.rst b/doc/guides/prog_guide/source_org.rst index 6e51bf7b4d..394de018b8 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_virtio # virtio poll mode driver +-- librte_pmd_vmxnet3 # VMXNET3 poll mode driver +-- librte_pmd_xenvirt # Xen virtio poll mode driver +-- librte_power # power management library @@ -109,6 +108,7 @@ The drivers directory has a net subdirectory which contains:: +-- null # NULL poll mode driver for testing +-- pcap # PCAP poll mode driver +-- ring # ring poll mode driver + +-- virtio # virtio poll mode driver Applications ------------ diff --git a/drivers/net/Makefile b/drivers/net/Makefile index f641f0a633..ec32e5251c 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -42,6 +42,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4 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 include $(RTE_SDK)/mk/rte.sharelib.mk include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/lib/librte_pmd_virtio/Makefile b/drivers/net/virtio/Makefile similarity index 100% rename from lib/librte_pmd_virtio/Makefile rename to drivers/net/virtio/Makefile diff --git a/lib/librte_pmd_virtio/rte_pmd_virtio_version.map b/drivers/net/virtio/rte_pmd_virtio_version.map similarity index 100% rename from lib/librte_pmd_virtio/rte_pmd_virtio_version.map rename to drivers/net/virtio/rte_pmd_virtio_version.map diff --git a/lib/librte_pmd_virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c similarity index 100% rename from lib/librte_pmd_virtio/virtio_ethdev.c rename to drivers/net/virtio/virtio_ethdev.c diff --git a/lib/librte_pmd_virtio/virtio_ethdev.h b/drivers/net/virtio/virtio_ethdev.h similarity index 100% rename from lib/librte_pmd_virtio/virtio_ethdev.h rename to drivers/net/virtio/virtio_ethdev.h diff --git a/lib/librte_pmd_virtio/virtio_logs.h b/drivers/net/virtio/virtio_logs.h similarity index 100% rename from lib/librte_pmd_virtio/virtio_logs.h rename to drivers/net/virtio/virtio_logs.h diff --git a/lib/librte_pmd_virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c similarity index 100% rename from lib/librte_pmd_virtio/virtio_pci.c rename to drivers/net/virtio/virtio_pci.c diff --git a/lib/librte_pmd_virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h similarity index 100% rename from lib/librte_pmd_virtio/virtio_pci.h rename to drivers/net/virtio/virtio_pci.h diff --git a/lib/librte_pmd_virtio/virtio_ring.h b/drivers/net/virtio/virtio_ring.h similarity index 100% rename from lib/librte_pmd_virtio/virtio_ring.h rename to drivers/net/virtio/virtio_ring.h diff --git a/lib/librte_pmd_virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c similarity index 100% rename from lib/librte_pmd_virtio/virtio_rxtx.c rename to drivers/net/virtio/virtio_rxtx.c diff --git a/lib/librte_pmd_virtio/virtqueue.c b/drivers/net/virtio/virtqueue.c similarity index 100% rename from lib/librte_pmd_virtio/virtqueue.c rename to drivers/net/virtio/virtqueue.c diff --git a/lib/librte_pmd_virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h similarity index 100% rename from lib/librte_pmd_virtio/virtqueue.h rename to drivers/net/virtio/virtqueue.h diff --git a/lib/Makefile b/lib/Makefile index 0bb87ba767..3e5cab09ac 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_VIRTIO_PMD) += librte_pmd_virtio 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 -- 2.20.1