From 7b8964c5c88ca0eb5de72d71adf7dc69028c2ac3 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Tue, 26 May 2020 05:54:02 -0400 Subject: [PATCH] lib/env_dpdk: rename pci_init/fini() to pci_env_init/fini() 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 Signed-off-by: Tomasz Zawadzki Change-Id: Ie6d6eea3a7b8a0f0223bd14bbe258061460a81dd Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2611 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Changpeng Liu Reviewed-by: Shuhei Matsumoto --- lib/env_dpdk/env_internal.h | 4 ++-- lib/env_dpdk/init.c | 4 ++-- lib/env_dpdk/pci.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/env_dpdk/env_internal.h b/lib/env_dpdk/env_internal.h index 75e5ecc61..1d7845a98 100644 --- a/lib/env_dpdk/env_internal.h +++ b/lib/env_dpdk/env_internal.h @@ -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_fini(struct rte_pci_device *device); -void pci_init(void); -void pci_fini(void); +void pci_env_init(void); +void pci_env_fini(void); int mem_map_init(bool legacy_mem); int vtophys_init(void); diff --git a/lib/env_dpdk/init.c b/lib/env_dpdk/init.c index 3d5598f11..ed0ddaea2 100644 --- a/lib/env_dpdk/init.c +++ b/lib/env_dpdk/init.c @@ -499,7 +499,7 @@ spdk_env_dpdk_post_init(bool legacy_mem) { int rc; - pci_init(); + pci_env_init(); rc = mem_map_init(legacy_mem); if (rc < 0) { @@ -519,7 +519,7 @@ spdk_env_dpdk_post_init(bool legacy_mem) void spdk_env_dpdk_post_fini(void) { - pci_fini(); + pci_env_fini(); free_args(g_eal_cmdline, g_eal_cmdline_argcount); } diff --git a/lib/env_dpdk/pci.c b/lib/env_dpdk/pci.c index ced4a93e0..f43e5272b 100644 --- a/lib/env_dpdk/pci.c +++ b/lib/env_dpdk/pci.c @@ -259,7 +259,7 @@ _get_alarm_thread_cb(void *unused) } void -pci_init(void) +pci_env_init(void) { #if RTE_VERSION >= RTE_VERSION_NUM(18, 11, 0, 0) struct spdk_pci_driver *driver; @@ -298,7 +298,7 @@ pci_init(void) } void -pci_fini(void) +pci_env_fini(void) { struct spdk_pci_device *dev; char bdf[32];