From 4c5246c97f2d2ee4dfae991634a49ec7fab43368 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Thu, 15 Jul 2021 06:14:51 -0400 Subject: [PATCH] lib/event: add governor structure name in SPDK_GOVERNOR_REGISTER macro Registering multiple governors would fail due to them having the same name. Only saved by the fact that right now, there is only one governor registered in this fashion. Fix it by adding name of the governor structure passed to the function name. Signed-off-by: Tomasz Zawadzki Change-Id: Ic7a206da2c8f5dc1e72e41629bccf989c030f182 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8792 Tested-by: SPDK CI Jenkins Community-CI: Mellanox Build Bot Community-CI: Broadcom CI Reviewed-by: Ben Walker Reviewed-by: Jim Harris Reviewed-by: Konrad Sztyber --- include/spdk_internal/event.h | 4 ++-- lib/event/dpdk_governor.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/spdk_internal/event.h b/include/spdk_internal/event.h index e41690e04..80af1a9cd 100644 --- a/include/spdk_internal/event.h +++ b/include/spdk_internal/event.h @@ -220,9 +220,9 @@ struct spdk_governor *_spdk_governor_get(void); * Macro used to register new cores governor. */ #define SPDK_GOVERNOR_REGISTER(governor) \ - static void __attribute__((constructor)) _spdk_governor_register_##name(void) \ + static void __attribute__((constructor)) _spdk_governor_register_ ## governor(void) \ { \ - _spdk_governor_list_add(governor); \ + _spdk_governor_list_add(&governor); \ } \ /** diff --git a/lib/event/dpdk_governor.c b/lib/event/dpdk_governor.c index e6384d746..3fcd4ebf6 100644 --- a/lib/event/dpdk_governor.c +++ b/lib/event/dpdk_governor.c @@ -187,4 +187,4 @@ static struct spdk_governor dpdk_governor = { .deinit = _deinit, }; -SPDK_GOVERNOR_REGISTER(&dpdk_governor); +SPDK_GOVERNOR_REGISTER(dpdk_governor);