ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib/env_dpdk: rename pci_init/fini() to pci_env_init/fini()

Browse Source 
Patch below removed spdk_* prefix from functions in env_dpdk:
(15d0ae62) lib/env_dpdk: remove spdk prefix from internal functions.

This resulted in name conflict with libpci PCI Utilities library
pci_init() function.

Fixes #1407

Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2611 (master)
Change-Id: Ie6d6eea3a7b8a0f0223bd14bbe258061460a81dd
Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2614
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Tomasz Zawadzki 2020-05-26 05:54:02 -04:00
parent 9da2afe938
commit 78554349e7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/env_dpdk/env_internal.h
View File

@ -77,8 +77,8 @@ void pci_driver_register(struct spdk_pci_driver *driver);
int pci_device_init(struct rte_pci_driver *driver, struct rte_pci_device *device); int pci_device_init(struct rte_pci_driver *driver, struct rte_pci_device *device);
int pci_device_fini(struct rte_pci_device *device); int pci_device_fini(struct rte_pci_device *device);
void pci_init(void); void pci_env_init(void);
void pci_fini(void); void pci_env_fini(void);
int mem_map_init(bool legacy_mem); int mem_map_init(bool legacy_mem);
int vtophys_init(void); int vtophys_init(void);

4
lib/env_dpdk/init.c
View File

@ -499,7 +499,7 @@ spdk_env_dpdk_post_init(bool legacy_mem)
{ {
int rc; int rc;
pci_init(); pci_env_init();
rc = mem_map_init(legacy_mem); rc = mem_map_init(legacy_mem);
if (rc < 0) { if (rc < 0) {
@ -519,7 +519,7 @@ spdk_env_dpdk_post_init(bool legacy_mem)
void void
spdk_env_dpdk_post_fini(void) spdk_env_dpdk_post_fini(void)
{ {
pci_fini(); pci_env_fini();
spdk_free_args(g_eal_cmdline, g_eal_cmdline_argcount); spdk_free_args(g_eal_cmdline, g_eal_cmdline_argcount);
} }

4
lib/env_dpdk/pci.c
View File

@ -259,7 +259,7 @@ _get_alarm_thread_cb(void *unused)
} }
void void
pci_init(void) pci_env_init(void)
{ {
#if RTE_VERSION >= RTE_VERSION_NUM(18, 11, 0, 0) #if RTE_VERSION >= RTE_VERSION_NUM(18, 11, 0, 0)
struct spdk_pci_driver *driver; struct spdk_pci_driver *driver;
@ -298,7 +298,7 @@ pci_init(void)
} }
void void
pci_fini(void) pci_env_fini(void)
{ {
struct spdk_pci_device *dev; struct spdk_pci_device *dev;
char bdf[32]; char bdf[32];