[v4,6/6] power: clean up includes
Checks
Commit Message
From: Bruce Richardson <bruce.richardson@intel.com>
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 <bruce.richardson@intel.com>
Signed-off-by: David Hunt <david.hunt@intel.com>
---
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(-)
Comments
On 21-Jan-21 5:22 PM, David Hunt wrote:
> From: Bruce Richardson <bruce.richardson@intel.com>
>
> 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 <bruce.richardson@intel.com>
> Signed-off-by: David Hunt <david.hunt@intel.com>
> ---
> 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 c7d5bf5a8..0a28cb643 100644
> --- a/examples/vm_power_manager/channel_manager.c
> +++ b/examples/vm_power_manager/channel_manager.c
> @@ -27,7 +27,6 @@
> #include <libvirt/libvirt.h>
>
> #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 <libvirt/libvirt.h>
> #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 <rte_power.h>
> #include "channel_manager.h"
Should have newline before quoted headers, e.g.
#include <blah>
#include "blah"
Otherwise,
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
@@ -27,7 +27,6 @@
#include <libvirt/libvirt.h>
#include "channel_manager.h"
-#include "rte_power_guest_channel.h"
#include "channel_monitor.h"
#include "power_manager.h"
@@ -35,7 +35,6 @@
#include <libvirt/libvirt.h>
#include "channel_monitor.h"
-#include "rte_power_guest_channel.h"
#include "channel_manager.h"
#include "power_manager.h"
#include "oob_monitor.h"
@@ -5,8 +5,8 @@
#ifndef CHANNEL_MONITOR_H_
#define CHANNEL_MONITOR_H_
+#include <rte_power.h>
#include "channel_manager.h"
-#include "rte_power_guest_channel.h"
struct core_share {
unsigned int pcpu;
@@ -19,7 +19,6 @@
#include <rte_ethdev.h>
#include <rte_power.h>
-#include <guest_channel.h>
#include "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);
@@ -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;
@@ -15,9 +15,9 @@
#include <rte_log.h>
+#include <rte_power.h>
#include "guest_channel.h"
-#include "rte_power_guest_channel.h"
#define RTE_LOGTYPE_GUEST_CHANNEL RTE_LOGTYPE_USER1
@@ -8,8 +8,6 @@
extern "C" {
#endif
-#include <rte_power_guest_channel.h>
-
/**
* Check if any Virtio-Serial VM end-points exist in path.
*
@@ -6,8 +6,8 @@
#include <rte_log.h>
-#include "guest_channel.h"
#include "rte_power_guest_channel.h"
+#include "guest_channel.h"
#include "power_kvm_vm.h"
#include "power_common.h"
@@ -14,6 +14,7 @@
#include <rte_byteorder.h>
#include <rte_log.h>
#include <rte_string_fns.h>
+#include <rte_power_guest_channel.h>
#ifdef __cplusplus
extern "C" {
@@ -8,9 +8,6 @@
extern "C" {
#endif
-#include <stdint.h>
-#include <stdbool.h>
-
#define RTE_POWER_MAX_VFS 10
#define RTE_POWER_VM_MAX_NAME_SZ 32
#define RTE_POWER_MAX_VCPU_PER_VM 8