From 6d71d3b6ee0b6668e991c0296e55f3f41f8b88f2 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@intel.com>
Date: Fri, 15 May 2015 16:57:00 +0100
Subject: [PATCH] xenvirt: move drivers/net/
Move xenvirt PMD to drivers/net directory
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: John McNamara <john.mcnamara@intel.com>
Acked-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---
MAINTAINERS | 2 +-
doc/guides/prog_guide/source_org.rst | 2 +-
drivers/net/Makefile | 1 +
{lib/librte_pmd_xenvirt => drivers/net/xenvirt}/Makefile | 0
.../net/xenvirt}/rte_eth_xenvirt.c | 0
.../net/xenvirt}/rte_eth_xenvirt.h | 0
.../net/xenvirt}/rte_eth_xenvirt_version.map | 0
.../net/xenvirt}/rte_mempool_gntalloc.c | 0
{lib/librte_pmd_xenvirt => drivers/net/xenvirt}/rte_xen_lib.c | 0
{lib/librte_pmd_xenvirt => drivers/net/xenvirt}/rte_xen_lib.h | 0
{lib/librte_pmd_xenvirt => drivers/net/xenvirt}/virtio_logs.h | 0
{lib/librte_pmd_xenvirt => drivers/net/xenvirt}/virtqueue.h | 0
lib/Makefile | 1 -
lib/librte_eal/linuxapp/eal/Makefile | 2 +-
14 files changed, 4 insertions(+), 4 deletions(-)
rename {lib/librte_pmd_xenvirt => drivers/net/xenvirt}/Makefile (100%)
rename {lib/librte_pmd_xenvirt => drivers/net/xenvirt}/rte_eth_xenvirt.c (100%)
rename {lib/librte_pmd_xenvirt => drivers/net/xenvirt}/rte_eth_xenvirt.h (100%)
rename {lib/librte_pmd_xenvirt => drivers/net/xenvirt}/rte_eth_xenvirt_version.map (100%)
rename {lib/librte_pmd_xenvirt => drivers/net/xenvirt}/rte_mempool_gntalloc.c (100%)
rename {lib/librte_pmd_xenvirt => drivers/net/xenvirt}/rte_xen_lib.c (100%)
rename {lib/librte_pmd_xenvirt => drivers/net/xenvirt}/rte_xen_lib.h (100%)
rename {lib/librte_pmd_xenvirt => drivers/net/xenvirt}/virtio_logs.h (100%)
rename {lib/librte_pmd_xenvirt => drivers/net/xenvirt}/virtqueue.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 7b8cb2349d..9362c190bc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -132,7 +132,7 @@ 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: lib/librte_mempool/rte_dom0_mempool.c
-F: lib/librte_pmd_xenvirt/
+F: drivers/net/xenvirt/
F: doc/guides/xen/
F: app/test-pmd/mempool_*
F: examples/vhost_xen/
diff --git a/doc/guides/prog_guide/source_org.rst b/doc/guides/prog_guide/source_org.rst
index b3413f0aaa..4f6f489f1b 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_xenvirt # Xen virtio poll mode driver
+-- librte_power # power management library
+-- librte_ring # software rings (act as lockless FIFOs)
+-- librte_sched # QoS scheduler and dropper library
@@ -109,6 +108,7 @@ The drivers directory has a net subdirectory which contains::
+-- ring # ring poll mode driver
+-- virtio # virtio poll mode driver
+-- vmxnet3 # VMXNET3 poll mode driver
+ +-- xenvirt # Xen virtio poll mode driver
Applications
------------
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 7763845e66..1e6648aa45 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -44,6 +44,7 @@ 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
+DIRS-$(CONFIG_RTE_LIBRTE_PMD_XENVIRT) += xenvirt
include $(RTE_SDK)/mk/rte.sharelib.mk
include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/lib/librte_pmd_xenvirt/Makefile b/drivers/net/xenvirt/Makefile
similarity index 100%
rename from lib/librte_pmd_xenvirt/Makefile
rename to drivers/net/xenvirt/Makefile
diff --git a/lib/librte_pmd_xenvirt/rte_eth_xenvirt.c b/drivers/net/xenvirt/rte_eth_xenvirt.c
similarity index 100%
rename from lib/librte_pmd_xenvirt/rte_eth_xenvirt.c
rename to drivers/net/xenvirt/rte_eth_xenvirt.c
diff --git a/lib/librte_pmd_xenvirt/rte_eth_xenvirt.h b/drivers/net/xenvirt/rte_eth_xenvirt.h
similarity index 100%
rename from lib/librte_pmd_xenvirt/rte_eth_xenvirt.h
rename to drivers/net/xenvirt/rte_eth_xenvirt.h
diff --git a/lib/librte_pmd_xenvirt/rte_eth_xenvirt_version.map b/drivers/net/xenvirt/rte_eth_xenvirt_version.map
similarity index 100%
rename from lib/librte_pmd_xenvirt/rte_eth_xenvirt_version.map
rename to drivers/net/xenvirt/rte_eth_xenvirt_version.map
diff --git a/lib/librte_pmd_xenvirt/rte_mempool_gntalloc.c b/drivers/net/xenvirt/rte_mempool_gntalloc.c
similarity index 100%
rename from lib/librte_pmd_xenvirt/rte_mempool_gntalloc.c
rename to drivers/net/xenvirt/rte_mempool_gntalloc.c
diff --git a/lib/librte_pmd_xenvirt/rte_xen_lib.c b/drivers/net/xenvirt/rte_xen_lib.c
similarity index 100%
rename from lib/librte_pmd_xenvirt/rte_xen_lib.c
rename to drivers/net/xenvirt/rte_xen_lib.c
diff --git a/lib/librte_pmd_xenvirt/rte_xen_lib.h b/drivers/net/xenvirt/rte_xen_lib.h
similarity index 100%
rename from lib/librte_pmd_xenvirt/rte_xen_lib.h
rename to drivers/net/xenvirt/rte_xen_lib.h
diff --git a/lib/librte_pmd_xenvirt/virtio_logs.h b/drivers/net/xenvirt/virtio_logs.h
similarity index 100%
rename from lib/librte_pmd_xenvirt/virtio_logs.h
rename to drivers/net/xenvirt/virtio_logs.h
diff --git a/lib/librte_pmd_xenvirt/virtqueue.h b/drivers/net/xenvirt/virtqueue.h
similarity index 100%
rename from lib/librte_pmd_xenvirt/virtqueue.h
rename to drivers/net/xenvirt/virtqueue.h
diff --git a/lib/Makefile b/lib/Makefile
index 81cf0c1e20..5f480f9590 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_PMD_XENVIRT) += librte_pmd_xenvirt
DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += librte_vhost
DIRS-$(CONFIG_RTE_LIBRTE_HASH) += librte_hash
DIRS-$(CONFIG_RTE_LIBRTE_LPM) += librte_lpm
diff --git a/lib/librte_eal/linuxapp/eal/Makefile b/lib/librte_eal/linuxapp/eal/Makefile
index bc1e90d419..077ea99fef 100644
--- a/lib/librte_eal/linuxapp/eal/Makefile
+++ b/lib/librte_eal/linuxapp/eal/Makefile
@@ -50,7 +50,7 @@ CFLAGS += -I$(RTE_SDK)/lib/librte_ivshmem
CFLAGS += -I$(RTE_SDK)/drivers/net/ring
CFLAGS += -I$(RTE_SDK)/drivers/net/pcap
CFLAGS += -I$(RTE_SDK)/drivers/net/af_packet
-CFLAGS += -I$(RTE_SDK)/lib/librte_pmd_xenvirt
+CFLAGS += -I$(RTE_SDK)/drivers/net/xenvirt
CFLAGS += $(WERROR_FLAGS) -O3
# specific to linuxapp exec-env
--
2.39.5