From: David Hunt <david.hunt@intel.com>
To: dev@dpdk.org
Cc: david.hunt@intel.com, stable@dpdk.org,
Bruce Richardson <bruce.richardson@intel.com>
Subject: [dpdk-stable] [PATCH v4 6/6] power: clean up includes
Date: Thu, 21 Jan 2021 17:22:01 +0000 [thread overview]
Message-ID: <20210121172201.22582-7-david.hunt@intel.com> (raw)
In-Reply-To: <20210121172201.22582-1-david.hunt@intel.com>
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"
-#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 <rte_ethdev.h>
#include <rte_power.h>
-#include <guest_channel.h>
#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 <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
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 <rte_power_guest_channel.h>
-
/**
* 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 <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"
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 <rte_byteorder.h>
#include <rte_log.h>
#include <rte_string_fns.h>
+#include <rte_power_guest_channel.h>
#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 <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
--
2.17.1
next prev parent reply other threads:[~2021-01-21 17:23 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-17 11:36 [dpdk-stable] [PATCH v1] power: fix make build for power apps David Hunt
2021-01-08 14:30 ` [dpdk-stable] [PATCH 0/6] " David Hunt
2021-01-08 14:30 ` [dpdk-stable] [PATCH v2 1/6] power: create guest channel public header file David Hunt
2021-01-20 13:55 ` [dpdk-stable] [PATCH v3 0/6] power: fix make build for power apps David Hunt
2021-01-20 13:55 ` [dpdk-stable] [PATCH v3 1/6] power: create guest channel public header file David Hunt
2021-01-20 15:09 ` [dpdk-stable] [dpdk-dev] " Burakov, Anatoly
2021-01-20 15:12 ` David Hunt
2021-01-21 17:21 ` [dpdk-stable] [PATCH v4 0/6] power: fix make build for power apps David Hunt
2021-01-21 17:21 ` [dpdk-stable] [PATCH v4 1/6] power: create guest channel public header file David Hunt
2021-01-29 10:21 ` [dpdk-stable] [PATCH v5 0/6] power: fix make build for power apps David Hunt
2021-01-29 10:21 ` [dpdk-stable] [PATCH v5 1/6] power: create guest channel public header file David Hunt
2021-01-29 10:21 ` [dpdk-stable] [PATCH v5 2/6] power: make channel msg functions public David Hunt
2021-01-29 10:21 ` [dpdk-stable] [PATCH v5 3/6] power: rename public structs David Hunt
2021-01-29 10:21 ` [dpdk-stable] [PATCH v5 4/6] power: rename defines David Hunt
2021-01-29 10:21 ` [dpdk-stable] [PATCH v5 5/6] power: add new header file to export list David Hunt
2021-01-29 10:21 ` [dpdk-stable] [PATCH v5 6/6] power: clean up includes David Hunt
2021-01-29 10:30 ` [dpdk-stable] [dpdk-dev] [PATCH v5 0/6] power: fix make build for power apps Thomas Monjalon
2021-01-21 17:21 ` [dpdk-stable] [PATCH v4 2/6] power: make channel msg functions public David Hunt
2021-01-22 12:12 ` [dpdk-stable] [dpdk-dev] " Burakov, Anatoly
2021-02-22 9:53 ` [dpdk-stable] " Ferruh Yigit
2021-01-21 17:21 ` [dpdk-stable] [PATCH v4 3/6] power: rename public structs David Hunt
2021-01-22 12:15 ` [dpdk-stable] [dpdk-dev] " Burakov, Anatoly
2021-01-22 12:18 ` Burakov, Anatoly
2021-01-22 12:18 ` Burakov, Anatoly
2021-01-28 22:57 ` [dpdk-stable] " Thomas Monjalon
2021-02-22 9:56 ` Ferruh Yigit
2021-01-21 17:21 ` [dpdk-stable] [PATCH v4 4/6] power: rename defines David Hunt
2021-01-22 13:50 ` [dpdk-stable] [dpdk-dev] " Burakov, Anatoly
2021-01-21 17:22 ` [dpdk-stable] [PATCH v4 5/6] power: add new header file to export list David Hunt
2021-01-22 13:51 ` [dpdk-stable] [dpdk-dev] " Burakov, Anatoly
2021-01-21 17:22 ` David Hunt [this message]
2021-01-22 13:53 ` [dpdk-stable] [dpdk-dev] [PATCH v4 6/6] power: clean up includes Burakov, Anatoly
2021-01-29 10:27 ` [dpdk-stable] [PATCH v4 0/6] power: fix make build for power apps Thomas Monjalon
2021-02-24 13:16 ` [dpdk-stable] [PATCH] power: remove duplicated symbols from map file Ferruh Yigit
2021-02-24 15:24 ` Aaron Conole
2021-02-24 14:54 ` Ferruh Yigit
2021-02-25 9:11 ` [dpdk-stable] [dpdk-dev] " David Marchand
2021-02-25 10:41 ` Ferruh Yigit
2021-02-25 10:44 ` David Marchand
2021-02-25 10:54 ` [dpdk-stable] [PATCH v2] " Ferruh Yigit
2021-02-25 14:38 ` David Marchand
2021-03-02 12:42 ` David Marchand
2021-01-20 13:55 ` [dpdk-stable] [PATCH v3 2/6] power: make channel msg functions public David Hunt
2021-01-20 14:26 ` [dpdk-stable] [dpdk-dev] " Burakov, Anatoly
2021-01-20 15:08 ` David Hunt
2021-01-20 15:23 ` Burakov, Anatoly
2021-01-20 13:55 ` [dpdk-stable] [PATCH v3 3/6] power: rename public structs David Hunt
2021-01-20 14:27 ` [dpdk-stable] [dpdk-dev] " Burakov, Anatoly
2021-01-20 15:03 ` David Hunt
2021-01-20 13:55 ` [dpdk-stable] [PATCH v3 4/6] power: rename defines David Hunt
2021-01-20 13:55 ` [dpdk-stable] [PATCH v3 5/6] power: add new header file to export list David Hunt
2021-01-20 14:28 ` [dpdk-stable] [dpdk-dev] " Burakov, Anatoly
2021-01-20 15:01 ` David Hunt
2021-01-20 15:17 ` Burakov, Anatoly
2021-01-20 15:08 ` Bruce Richardson
2021-01-20 15:18 ` Burakov, Anatoly
2021-01-20 15:29 ` David Hunt
2021-01-20 15:43 ` Burakov, Anatoly
2021-01-20 13:55 ` [dpdk-stable] [PATCH v3 6/6] power: clean up includes David Hunt
2021-01-08 14:30 ` [dpdk-stable] [PATCH v2 2/6] power: make channel msg functions public David Hunt
2021-01-19 14:31 ` Thomas Monjalon
2021-01-19 14:51 ` David Hunt
2021-01-08 14:30 ` [dpdk-stable] [PATCH v2 3/6] power: rename public structs David Hunt
2021-01-08 14:30 ` [dpdk-stable] [PATCH v2 4/6] power: rename defines David Hunt
2021-01-08 14:30 ` [dpdk-stable] [PATCH v2 5/6] power: add new header file to export list David Hunt
2021-01-08 14:30 ` [dpdk-stable] [PATCH v2 6/6] power: clean up includes David Hunt
2021-01-13 11:08 ` [dpdk-stable] [dpdk-dev] [PATCH 0/6] power: fix make build for power apps Burakov, Anatoly
2021-01-13 11:14 ` David Hunt
2021-01-13 11:18 ` Burakov, Anatoly
2021-01-13 13:25 ` David Hunt
2021-01-13 17:30 ` Burakov, Anatoly
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210121172201.22582-7-david.hunt@intel.com \
--to=david.hunt@intel.com \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).