From 5f443cc0f905a9bf25f6274aff58e6e29f049466 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 21 Jan 2021 17:21:56 +0000 Subject: [PATCH] power: create guest channel public header file In preparation for making the header file public, we first rename channel_commands.h as rte_power_guest_channel.h. Fixes: 210c383e247b ("power: packet format for vm power management") Fixes: cd0d5547e873 ("power: vm communication channels in guest") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson Signed-off-by: David Hunt --- examples/vm_power_manager/channel_manager.c | 2 +- examples/vm_power_manager/channel_monitor.c | 2 +- examples/vm_power_manager/channel_monitor.h | 2 +- examples/vm_power_manager/guest_cli/vm_power_cli_guest.h | 2 +- examples/vm_power_manager/vm_power_cli.c | 2 +- lib/librte_power/guest_channel.c | 2 +- lib/librte_power/guest_channel.h | 2 +- lib/librte_power/power_kvm_vm.c | 2 +- .../{channel_commands.h => rte_power_guest_channel.h} | 9 ++++----- 9 files changed, 12 insertions(+), 13 deletions(-) rename lib/librte_power/{channel_commands.h => rte_power_guest_channel.h} (94%) diff --git a/examples/vm_power_manager/channel_manager.c b/examples/vm_power_manager/channel_manager.c index 9dca6f6863..58a243b230 100644 --- a/examples/vm_power_manager/channel_manager.c +++ b/examples/vm_power_manager/channel_manager.c @@ -27,7 +27,7 @@ #include #include "channel_manager.h" -#include "channel_commands.h" +#include "rte_power_guest_channel.h" #include "channel_monitor.h" #include "power_manager.h" diff --git a/examples/vm_power_manager/channel_monitor.c b/examples/vm_power_manager/channel_monitor.c index 228f06803d..08306105d3 100644 --- a/examples/vm_power_manager/channel_monitor.c +++ b/examples/vm_power_manager/channel_monitor.c @@ -35,7 +35,7 @@ #include #include "channel_monitor.h" -#include "channel_commands.h" +#include "rte_power_guest_channel.h" #include "channel_manager.h" #include "power_manager.h" #include "oob_monitor.h" diff --git a/examples/vm_power_manager/channel_monitor.h b/examples/vm_power_manager/channel_monitor.h index 7362a80d26..4a526ff670 100644 --- a/examples/vm_power_manager/channel_monitor.h +++ b/examples/vm_power_manager/channel_monitor.h @@ -6,7 +6,7 @@ #define CHANNEL_MONITOR_H_ #include "channel_manager.h" -#include "channel_commands.h" +#include "rte_power_guest_channel.h" struct core_share { unsigned int pcpu; diff --git a/examples/vm_power_manager/guest_cli/vm_power_cli_guest.h b/examples/vm_power_manager/guest_cli/vm_power_cli_guest.h index 6ad14a3dea..2299d23dce 100644 --- a/examples/vm_power_manager/guest_cli/vm_power_cli_guest.h +++ b/examples/vm_power_manager/guest_cli/vm_power_cli_guest.h @@ -9,7 +9,7 @@ extern "C" { #endif -#include "channel_commands.h" +#include "rte_power_guest_channel.h" struct channel_packet *get_policy(void); diff --git a/examples/vm_power_manager/vm_power_cli.c b/examples/vm_power_manager/vm_power_cli.c index ed0623a41d..f7e1b596ec 100644 --- a/examples/vm_power_manager/vm_power_cli.c +++ b/examples/vm_power_manager/vm_power_cli.c @@ -21,7 +21,7 @@ #include "channel_manager.h" #include "channel_monitor.h" #include "power_manager.h" -#include "channel_commands.h" +#include "rte_power_guest_channel.h" struct cmd_quit_result { cmdline_fixed_string_t quit; diff --git a/lib/librte_power/guest_channel.c b/lib/librte_power/guest_channel.c index 7b5926e5c4..4cb5ae1ddf 100644 --- a/lib/librte_power/guest_channel.c +++ b/lib/librte_power/guest_channel.c @@ -17,7 +17,7 @@ #include #include "guest_channel.h" -#include "channel_commands.h" +#include "rte_power_guest_channel.h" #define RTE_LOGTYPE_GUEST_CHANNEL RTE_LOGTYPE_USER1 diff --git a/lib/librte_power/guest_channel.h b/lib/librte_power/guest_channel.h index e15db46fc7..d3d87f0ae2 100644 --- a/lib/librte_power/guest_channel.h +++ b/lib/librte_power/guest_channel.h @@ -8,7 +8,7 @@ extern "C" { #endif -#include +#include /** * Check if any Virtio-Serial VM end-points exist in path. diff --git a/lib/librte_power/power_kvm_vm.c b/lib/librte_power/power_kvm_vm.c index 409c3e03ab..649ebe85c4 100644 --- a/lib/librte_power/power_kvm_vm.c +++ b/lib/librte_power/power_kvm_vm.c @@ -7,7 +7,7 @@ #include #include "guest_channel.h" -#include "channel_commands.h" +#include "rte_power_guest_channel.h" #include "power_kvm_vm.h" #include "power_common.h" diff --git a/lib/librte_power/channel_commands.h b/lib/librte_power/rte_power_guest_channel.h similarity index 94% rename from lib/librte_power/channel_commands.h rename to lib/librte_power/rte_power_guest_channel.h index adc8e5ca27..ef3b064a85 100644 --- a/lib/librte_power/channel_commands.h +++ b/lib/librte_power/rte_power_guest_channel.h @@ -1,9 +1,8 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2010-2014 Intel Corporation + * Copyright(c) 2010-2021 Intel Corporation */ - -#ifndef CHANNEL_COMMANDS_H_ -#define CHANNEL_COMMANDS_H_ +#ifndef RTE_POWER_GUEST_CHANNEL_H +#define RTE_POWER_GUEST_CHANNEL_H #ifdef __cplusplus extern "C" { @@ -122,4 +121,4 @@ struct channel_packet_caps_list { } #endif -#endif /* CHANNEL_COMMANDS_H_ */ +#endif /* RTE_POWER_GUEST_CHANNEL_H_ */ -- 2.20.1