From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9DA6FA09E4 for ; Fri, 29 Jan 2021 11:23:02 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0246A2401B0; Fri, 29 Jan 2021 11:22:55 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mails.dpdk.org (Postfix) with ESMTP id 28BB1240182; Fri, 29 Jan 2021 11:22:46 +0100 (CET) IronPort-SDR: N7QgivBxTZ2Cq/kjdypk5lkvwtLk5fETAZFVVZ1UKHlM+o995usvd8kDm1zGBiXSclZLq90xHa +ZflMjKOalhQ== X-IronPort-AV: E=McAfee;i="6000,8403,9878"; a="244487249" X-IronPort-AV: E=Sophos;i="5.79,385,1602572400"; d="scan'208";a="244487249" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jan 2021 02:22:46 -0800 IronPort-SDR: AAhu+7N8osNYSuE8uRRTBc7qBxt4d8UkxQJRd0EbBzIR0MY/Ee/LQ7xXySexZdKyBLJUETrYOC CBjkR7YTBPmQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,385,1602572400"; d="scan'208";a="579113323" Received: from silpixa00399952.ir.intel.com (HELO silpixa00399952.ger.corp.intel.com) ([10.237.222.38]) by fmsmga005.fm.intel.com with ESMTP; 29 Jan 2021 02:22:44 -0800 From: David Hunt To: dev@dpdk.org Cc: david.hunt@intel.com, stable@dpdk.org, Bruce Richardson Date: Fri, 29 Jan 2021 10:21:49 +0000 Message-Id: <20210129102149.24463-7-david.hunt@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210129102149.24463-1-david.hunt@intel.com> References: <20210121172201.22582-2-david.hunt@intel.com> <20210129102149.24463-1-david.hunt@intel.com> Subject: [dpdk-stable] [PATCH v5 6/6] power: clean up includes X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" From: Bruce Richardson re-organise the including of the new public header file and remove un-needed includes 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 Acked-by: Anatoly Burakov --- examples/vm_power_manager/channel_manager.c | 1 - examples/vm_power_manager/channel_monitor.c | 1 - examples/vm_power_manager/channel_monitor.h | 2 +- examples/vm_power_manager/guest_cli/vm_power_cli_guest.c | 1 - examples/vm_power_manager/guest_cli/vm_power_cli_guest.h | 2 -- examples/vm_power_manager/vm_power_cli.c | 1 - lib/librte_power/guest_channel.c | 2 +- lib/librte_power/guest_channel.h | 2 -- lib/librte_power/power_kvm_vm.c | 2 +- lib/librte_power/rte_power.h | 1 + lib/librte_power/rte_power_guest_channel.h | 3 --- 11 files changed, 4 insertions(+), 14 deletions(-) diff --git a/examples/vm_power_manager/channel_manager.c b/examples/vm_power_manager/channel_manager.c index 58a243b23..458e37167 100644 --- a/examples/vm_power_manager/channel_manager.c +++ b/examples/vm_power_manager/channel_manager.c @@ -27,7 +27,6 @@ #include #include "channel_manager.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 7bb33e026..99f81544d 100644 --- a/examples/vm_power_manager/channel_monitor.c +++ b/examples/vm_power_manager/channel_monitor.c @@ -35,7 +35,6 @@ #include #include "channel_monitor.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 5d3537b91..9184a8327 100644 --- a/examples/vm_power_manager/channel_monitor.h +++ b/examples/vm_power_manager/channel_monitor.h @@ -5,8 +5,8 @@ #ifndef CHANNEL_MONITOR_H_ #define CHANNEL_MONITOR_H_ +#include #include "channel_manager.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.c b/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c index ec6409abd..0bf5774ff 100644 --- a/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c +++ b/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c @@ -19,7 +19,6 @@ #include #include -#include #include "vm_power_cli_guest.h" 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 5d285ca9d..b578ec072 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,8 +9,6 @@ extern "C" { #endif -#include "rte_power_guest_channel.h" - struct rte_power_channel_packet *get_policy(void); int set_policy_mac(int port, int idx); diff --git a/examples/vm_power_manager/vm_power_cli.c b/examples/vm_power_manager/vm_power_cli.c index f7e1b596e..1a55e553b 100644 --- a/examples/vm_power_manager/vm_power_cli.c +++ b/examples/vm_power_manager/vm_power_cli.c @@ -21,7 +21,6 @@ #include "channel_manager.h" #include "channel_monitor.h" #include "power_manager.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 039cb1872..2f7507a03 100644 --- a/lib/librte_power/guest_channel.c +++ b/lib/librte_power/guest_channel.c @@ -15,9 +15,9 @@ #include +#include #include "guest_channel.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 7d3a909d9..24f609df3 100644 --- a/lib/librte_power/guest_channel.h +++ b/lib/librte_power/guest_channel.h @@ -8,8 +8,6 @@ extern "C" { #endif -#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 27f9937aa..ab7d4b8ce 100644 --- a/lib/librte_power/power_kvm_vm.c +++ b/lib/librte_power/power_kvm_vm.c @@ -6,8 +6,8 @@ #include -#include "guest_channel.h" #include "rte_power_guest_channel.h" +#include "guest_channel.h" #include "power_kvm_vm.h" #include "power_common.h" diff --git a/lib/librte_power/rte_power.h b/lib/librte_power/rte_power.h index bbbde4dfb..c8086bf6b 100644 --- a/lib/librte_power/rte_power.h +++ b/lib/librte_power/rte_power.h @@ -14,6 +14,7 @@ #include #include #include +#include #ifdef __cplusplus extern "C" { diff --git a/lib/librte_power/rte_power_guest_channel.h b/lib/librte_power/rte_power_guest_channel.h index b9273a025..adc973817 100644 --- a/lib/librte_power/rte_power_guest_channel.h +++ b/lib/librte_power/rte_power_guest_channel.h @@ -8,9 +8,6 @@ extern "C" { #endif -#include -#include - #define RTE_POWER_MAX_VFS 10 #define RTE_POWER_VM_MAX_NAME_SZ 32 #define RTE_POWER_MAX_VCPU_PER_VM 8 -- 2.17.1