[PATCH 0/2] [PATCH 0/2] eal cleanup

[PATCH 0/2] [PATCH 0/2] eal cleanup

[David Marchand]

Here is some trivial cleanup for eal.

Nothing really astounding but this will ease an unfinished patchset I have
been working on for some time (getting rid of any driver specific stuff in
eal).


-- 
David Marchand

David Marchand (2):
  eal: remove dependency on drivers
  eal: remove useless header inclusion

 app/test-pmd/cmdline.c                    | 1 -
 lib/librte_eal/bsdapp/eal/Makefile        | 3 ---
 lib/librte_eal/bsdapp/eal/eal.c           | 1 -
 lib/librte_eal/bsdapp/eal/eal_pci.c       | 1 -
 lib/librte_eal/linuxapp/eal/Makefile      | 5 -----
 lib/librte_eal/linuxapp/eal/eal.c         | 1 -
 lib/librte_eal/linuxapp/eal/eal_pci.c     | 1 -
 lib/librte_eal/linuxapp/eal/eal_pci_uio.c | 1 -
 8 files changed, 14 deletions(-)

-- 
2.4.6

[PATCH 1/2] eal: remove dependency on drivers

[David Marchand]

There is no reason why eal should depend on drivers.
Remove remaining (unused) references.

Signed-off-by: David Marchand <david.marchand@6wind.com>
---
 lib/librte_eal/bsdapp/eal/Makefile   | 3 ---
 lib/librte_eal/bsdapp/eal/eal.c      | 1 -
 lib/librte_eal/linuxapp/eal/Makefile | 5 -----
 lib/librte_eal/linuxapp/eal/eal.c    | 1 -
 4 files changed, 10 deletions(-)

diff --git a/lib/librte_eal/bsdapp/eal/Makefile b/lib/librte_eal/bsdapp/eal/Makefile
index 064b0c5..01e5972 100644
--- a/lib/librte_eal/bsdapp/eal/Makefile
+++ b/lib/librte_eal/bsdapp/eal/Makefile
@@ -40,9 +40,6 @@ CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common
 CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common/include
 CFLAGS += -I$(RTE_SDK)/lib/librte_ring
 CFLAGS += -I$(RTE_SDK)/lib/librte_mempool
-CFLAGS += -I$(RTE_SDK)/lib/librte_ether
-CFLAGS += -I$(RTE_SDK)/drivers/net/ring
-CFLAGS += -I$(RTE_SDK)/drivers/net/pcap
 CFLAGS += $(WERROR_FLAGS) -O3
 
 EXPORT_MAP := rte_eal_version.map
diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
index 4ee3ad2..1b6f705 100644
--- a/lib/librte_eal/bsdapp/eal/eal.c
+++ b/lib/librte_eal/bsdapp/eal/eal.c
@@ -71,7 +71,6 @@
 #include <rte_version.h>
 #include <rte_atomic.h>
 #include <malloc_heap.h>
-#include <rte_eth_ring.h>
 
 #include "eal_private.h"
 #include "eal_thread.h"
diff --git a/lib/librte_eal/linuxapp/eal/Makefile b/lib/librte_eal/linuxapp/eal/Makefile
index 00ed62e..0726ce1 100644
--- a/lib/librte_eal/linuxapp/eal/Makefile
+++ b/lib/librte_eal/linuxapp/eal/Makefile
@@ -44,12 +44,7 @@ CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common
 CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common/include
 CFLAGS += -I$(RTE_SDK)/lib/librte_ring
 CFLAGS += -I$(RTE_SDK)/lib/librte_mempool
-CFLAGS += -I$(RTE_SDK)/lib/librte_ether
 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)/drivers/net/xenvirt
 CFLAGS += $(WERROR_FLAGS) -O3
 
 # specific to linuxapp exec-env
diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
index 43efd9e..33e1067 100644
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -75,7 +75,6 @@
 #include <rte_version.h>
 #include <rte_atomic.h>
 #include <malloc_heap.h>
-#include <rte_eth_ring.h>
 
 #include "eal_private.h"
 #include "eal_thread.h"
-- 
2.4.6

[PATCH 2/2] eal: remove useless header inclusion

[David Marchand]

Signed-off-by: David Marchand <david.marchand@6wind.com>
---
 app/test-pmd/cmdline.c                    | 1 -
 lib/librte_eal/bsdapp/eal/eal_pci.c       | 1 -
 lib/librte_eal/linuxapp/eal/eal_pci.c     | 1 -
 lib/librte_eal/linuxapp/eal/eal_pci_uio.c | 1 -
 4 files changed, 4 deletions(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 8ab4687..f516b84 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -84,7 +84,6 @@
 #include <cmdline_parse_etheraddr.h>
 #include <cmdline_socket.h>
 #include <cmdline.h>
-#include <rte_pci_dev_ids.h>
 #ifdef RTE_LIBRTE_PMD_BOND
 #include <rte_eth_bond.h>
 #endif
diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/eal/eal_pci.c
index ed31222..524c153 100644
--- a/lib/librte_eal/bsdapp/eal/eal_pci.c
+++ b/lib/librte_eal/bsdapp/eal/eal_pci.c
@@ -67,7 +67,6 @@
 #include <rte_debug.h>
 #include <rte_devargs.h>
 
-#include "rte_pci_dev_ids.h"
 #include "eal_filesystem.h"
 #include "eal_private.h"
 
diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c
index 9a28ede..5ac1571 100644
--- a/lib/librte_eal/linuxapp/eal/eal_pci.c
+++ b/lib/librte_eal/linuxapp/eal/eal_pci.c
@@ -41,7 +41,6 @@
 #include <rte_devargs.h>
 #include <rte_memcpy.h>
 
-#include "rte_pci_dev_ids.h"
 #include "eal_filesystem.h"
 #include "eal_private.h"
 #include "eal_pci_init.h"
diff --git a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c
index c35feb4..8bbcef0 100644
--- a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c
+++ b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c
@@ -45,7 +45,6 @@
 #include <rte_common.h>
 #include <rte_malloc.h>
 
-#include "rte_pci_dev_ids.h"
 #include "eal_filesystem.h"
 #include "eal_pci_init.h"
 
-- 
2.4.6

Re: [PATCH 2/2] eal: remove useless header inclusion

[Thomas Monjalon]

2015-07-23 09:15, David Marchand:
> --- a/app/test-pmd/cmdline.c
> +++ b/app/test-pmd/cmdline.c
> @@ -84,7 +84,6 @@
>  #include <cmdline_parse_etheraddr.h>
>  #include <cmdline_socket.h>
>  #include <cmdline.h>
> -#include <rte_pci_dev_ids.h>

This one is "needed" to check bypass support.
The bypass support should be managed inside the ixgbe driver, and the
specific code in testpmd must be removed.
Waiting this cleanup, the inclusion will be moved in the #ifdef BYPASS.

Note: this ugly bypass code was already signaled few times.
If it's not reworked soon (without ifdef), it could be dropped.

Re: [PATCH 0/2] [PATCH 0/2] eal cleanup

[Thomas Monjalon]

2015-07-23 09:15, David Marchand:
> Here is some trivial cleanup for eal.
> 
> Nothing really astounding but this will ease an unfinished patchset I have
> been working on for some time (getting rid of any driver specific stuff in
> eal).
> 
> David Marchand (2):
>   eal: remove dependency on drivers
>   eal: remove useless header inclusion

Applied with ixgbe bypass fix, thanks