From 52c674d23aba373a632aa700fbccd7f06408cadd Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Thu, 22 Sep 2022 00:48:23 +0000 Subject: [PATCH] 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: Jim Harris Change-Id: I7c8a4f9a6da6b3438ed09a881153b7a4ceef3a83 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14635 Reviewed-by: Ben Walker Reviewed-by: Changpeng Liu Reviewed-by: Aleksey Marchuk Tested-by: SPDK CI Jenkins --- lib/env_dpdk/env_internal.h | 2 +- lib/env_dpdk/init.c | 6 +++++- lib/env_dpdk/pci.c | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/env_dpdk/env_internal.h b/lib/env_dpdk/env_internal.h index 4e6145e7b..41774afd6 100644 --- a/lib/env_dpdk/env_internal.h +++ b/lib/env_dpdk/env_internal.h @@ -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); diff --git a/lib/env_dpdk/init.c b/lib/env_dpdk/init.c index fffff6fd4..d398afaf3 100644 --- a/lib/env_dpdk/init.c +++ b/lib/env_dpdk/init.c @@ -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) { diff --git a/lib/env_dpdk/pci.c b/lib/env_dpdk/pci.c index 9538754e7..fb206dcdf 100644 --- a/lib/env_dpdk/pci.c +++ b/lib/env_dpdk/pci.c @@ -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