Commit 52c674d2 authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

env_dpdk: make pci_env_init() return int 



This allows it to return error codes.  Have the
init code check the return value and fail the init
process when pci_env_init() returns error.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I7c8a4f9a6da6b3438ed09a881153b7a4ceef3a83
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14635


Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent a25a834a

lib/env_dpdk/env_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#define SHIFT_1GB	30 /* (1 << 30) == 1 GB */

#define MASK_1GB	((1ULL << SHIFT_1GB) - 1)



void pci_env_init(void);

int pci_env_init(void);

void pci_env_reinit(void);

void pci_env_fini(void);

int mem_map_init(bool legacy_mem);

lib/env_dpdk/init.c

+5 −1
Original line number Diff line number Diff line
@@ -524,7 +524,11 @@ spdk_env_dpdk_post_init(bool legacy_mem) 
{

	int rc;



	pci_env_init();

	rc = pci_env_init();

	if (rc < 0) {

		SPDK_ERRLOG("pci_env_init() failed\n");

		return rc;

	}



	rc = mem_map_init(legacy_mem);

	if (rc < 0) {

lib/env_dpdk/pci.c

+2 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ _pci_env_init(void) 
	}

}



void

int

pci_env_init(void)

{

	struct spdk_pci_driver *driver;
@@ -306,6 +306,7 @@ pci_env_init(void) 
	}



	_pci_env_init();

	return 0;

}



void