Commit 7b8964c5 authored by Tomasz Zawadzki's avatar Tomasz Zawadzki
Browse files

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: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: Ie6d6eea3a7b8a0f0223bd14bbe258061460a81dd
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2611


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent fe3fab26

lib/env_dpdk/env_internal.h

+2 −2
Original line number Diff line number Diff line
@@ -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);

lib/env_dpdk/init.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

}

lib/env_dpdk/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -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];