Commit 9177cfc2 authored by Tomasz Zawadzki's avatar Tomasz Zawadzki Committed by Jim Harris
Browse files

env: fix up pci_dpdk SPDK_ERRLOG strings 



They are now aligned between each other.

Change-Id: I8f396c48b6cc5ad9a81ac0df98f9e883b0fa1308
Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@nutanix.com>
Reviewed-on: https://review.spdk.io/c/spdk/spdk/+/25897


Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
parent a5a4c26b

lib/env_dpdk/pci_dpdk.c

+9 −10
Original line number Diff line number Diff line
@@ -42,8 +42,7 @@ dpdk_pci_init(void) 


	/* Anything 25.x or higher is not supported. */

	if (year >= 25) {

		SPDK_ERRLOG("DPDK version %d.%02d.%d not supported.\n", year, month, minor);

		return -EINVAL;

		goto not_supported;

	}



	if (year == 22 && month == 11) {
@@ -54,8 +53,7 @@ dpdk_pci_init(void) 
			 * no ABI changes for the minor release, or add new header files and

			 * pci_dpdk_xxx.c implementation for the new minor release.

			 */

			SPDK_ERRLOG("DPDK LTS version 22.11.%d not supported.\n", minor);

			return -EINVAL;

			goto not_supported;

		}

		g_dpdk_fn_table = &fn_table_2211;

	} else if (year == 23) {
@@ -63,8 +61,7 @@ dpdk_pci_init(void) 
		if ((month != 11 || minor != 0) &&

		    (month != 7 || minor != 0) &&

		    (month != 3 || minor != 0)) {

			SPDK_ERRLOG("DPDK version 23.%02d.%d is not supported.\n", month, minor);

			return -EINVAL;

			goto not_supported;

		}

		/* There were no changes between 22.11 and 23.11, so use the 22.11 implementation. */

		g_dpdk_fn_table = &fn_table_2211;
@@ -72,19 +69,21 @@ dpdk_pci_init(void) 
		/* Only 24.03.0 and 24.07.0 are supported. */

		if ((month != 7 || minor != 0) &&

		    (month != 3 || minor != 0)) {

			SPDK_ERRLOG("DPDK version 24.%02d.%d is not supported.\n", month, minor);

			return -EINVAL;

			goto not_supported;

		}

		/* There were no changes between 22.11 and 24.*, so use the 22.11 implementation. */

		g_dpdk_fn_table = &fn_table_2211;

	} else if (year < 21 || (year == 21 && month < 11)) {

		SPDK_ERRLOG("DPDK version %02d.%02d.%d is not supported.\n", year, month, minor);

		return -EINVAL;

		goto not_supported;

	} else {

		/* Everything else we use the 22.07 implementation. */

		g_dpdk_fn_table = &fn_table_2207;

	}

	return 0;



not_supported:

	SPDK_ERRLOG("DPDK version %02d.%02d.%d is not supported.\n", year, month, minor);

	return -EINVAL;

}



struct rte_mem_resource *