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