[PATCH v10 09/22] power: replace RTE_LOGTYPE_POWER with dynamic type

[Hunt, David]

On 22/02/2023 16:07, Stephen Hemminger wrote:
> Use dynamic log type for power library.
> Also replace use of RTE_LOGTYPE_USER1 with lib.power.guest.
>
> Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
> ---
>   lib/eal/common/eal_common_log.c | 1 -
>   lib/eal/include/rte_log.h       | 2 +-
>   lib/power/guest_channel.c       | 3 ++-
>   lib/power/power_common.c        | 2 ++
>   lib/power/power_common.h        | 3 ++-
>   lib/power/power_kvm_vm.c        | 1 +
>   lib/power/rte_power.c           | 1 +
>   7 files changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
> index 9e853addb717..39e1e6680dea 100644
> --- a/lib/eal/common/eal_common_log.c
> +++ b/lib/eal/common/eal_common_log.c
> @@ -355,7 +355,6 @@ static const struct logtype logtype_strings[] = {
>   	{RTE_LOGTYPE_HASH,       "lib.hash"},
>   	{RTE_LOGTYPE_LPM,        "lib.lpm"},
>   	{RTE_LOGTYPE_KNI,        "lib.kni"},
> -	{RTE_LOGTYPE_POWER,      "lib.power"},
>   	{RTE_LOGTYPE_METER,      "lib.meter"},
>   	{RTE_LOGTYPE_SCHED,      "lib.sched"},
>   	{RTE_LOGTYPE_PORT,       "lib.port"},
> diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
> index 1408722b2c2f..7d4345acceca 100644
> --- a/lib/eal/include/rte_log.h
> +++ b/lib/eal/include/rte_log.h
> @@ -36,7 +36,7 @@ extern "C" {
>   #define RTE_LOGTYPE_LPM        7 /**< Log related to LPM. */
>   #define RTE_LOGTYPE_KNI        8 /**< Log related to KNI. */
>   				 /* was RTE_LOGTYPE_ACL */
> -#define RTE_LOGTYPE_POWER     10 /**< Log related to power. */
> +				 /* was RTE_LOGTYPE_POWER */
>   #define RTE_LOGTYPE_METER     11 /**< Log related to QoS meter. */
>   #define RTE_LOGTYPE_SCHED     12 /**< Log related to QoS port scheduler. */
>   #define RTE_LOGTYPE_PORT      13 /**< Log related to port. */
> diff --git a/lib/power/guest_channel.c b/lib/power/guest_channel.c
> index 969a9e5aaa06..efc326d520ca 100644
> --- a/lib/power/guest_channel.c
> +++ b/lib/power/guest_channel.c
> @@ -17,7 +17,8 @@
>   
>   #include "guest_channel.h"
>   
> -#define RTE_LOGTYPE_GUEST_CHANNEL RTE_LOGTYPE_USER1
> +RTE_LOG_REGISTER_SUFFIX(guest_channel_logtype, guest, INFO);
> +#define RTE_LOGTYPE_GUEST_CHANNEL guest_channel_logtype
>   
>   /* Timeout for incoming message in milliseconds. */
>   #define TIMEOUT 10
> diff --git a/lib/power/power_common.c b/lib/power/power_common.c
> index 1e09facb863f..bf77eafa886b 100644
> --- a/lib/power/power_common.c
> +++ b/lib/power/power_common.c
> @@ -12,6 +12,8 @@
>   
>   #include "power_common.h"
>   
> +RTE_LOG_REGISTER_DEFAULT(power_logtype, INFO);
> +
>   #define POWER_SYSFILE_SCALING_DRIVER   \
>   		"/sys/devices/system/cpu/cpu%u/cpufreq/scaling_driver"
>   #define POWER_SYSFILE_GOVERNOR  \
> diff --git a/lib/power/power_common.h b/lib/power/power_common.h
> index c1c713927621..63a3a443509e 100644
> --- a/lib/power/power_common.h
> +++ b/lib/power/power_common.h
> @@ -5,11 +5,12 @@
>   #ifndef _POWER_COMMON_H_
>   #define _POWER_COMMON_H_
>   
> -
>   #include <rte_common.h>
>   
>   #define RTE_POWER_INVALID_FREQ_INDEX (~0)
>   
> +extern int power_logtype;
> +#define RTE_LOGTYPE_POWER power_logtype
>   
>   #ifdef RTE_LIBRTE_POWER_DEBUG
>   #define POWER_DEBUG_TRACE(fmt, args...) \
> diff --git a/lib/power/power_kvm_vm.c b/lib/power/power_kvm_vm.c
> index 6a8109d44959..db031f43105a 100644
> --- a/lib/power/power_kvm_vm.c
> +++ b/lib/power/power_kvm_vm.c
> @@ -8,6 +8,7 @@
>   
>   #include "rte_power_guest_channel.h"
>   #include "guest_channel.h"
> +#include "power_common.h"
>   #include "power_kvm_vm.h"
>   
>   #define FD_PATH "/dev/virtio-ports/virtio.serial.port.poweragent"
> diff --git a/lib/power/rte_power.c b/lib/power/rte_power.c
> index 63a43bd8f5ae..db0e7705a9ef 100644
> --- a/lib/power/rte_power.c
> +++ b/lib/power/rte_power.c
> @@ -10,6 +10,7 @@
>   #include "rte_power.h"
>   #include "power_acpi_cpufreq.h"
>   #include "power_cppc_cpufreq.h"
> +#include "power_common.h"
>   #include "power_kvm_vm.h"
>   #include "power_pstate_cpufreq.h"


Acked-by: David Hunt <david.hunt at intel.com>


>