From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 134AEA09E4
for <public@inbox.dpdk.org>; Thu, 21 Jan 2021 18:23:12 +0100 (CET)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id CB201140E0C;
Thu, 21 Jan 2021 18:23:08 +0100 (CET)
Received: from mga11.intel.com (mga11.intel.com [192.55.52.93])
by mails.dpdk.org (Postfix) with ESMTP id CAB32140DC6;
Thu, 21 Jan 2021 18:22:57 +0100 (CET)
IronPort-SDR: ZY1oFDWyJBCjNs1Z8aZEyHZ0O/v2yuRcVWlveDckVXDxTfdtotJ/s9QaBAgi6kGGkDSSewXXCl
ro1O6q1Iv32Q==
X-IronPort-AV: E=McAfee;i="6000,8403,9871"; a="175799689"
X-IronPort-AV: E=Sophos;i="5.79,364,1602572400"; d="scan'208";a="175799689"
Received: from orsmga008.jf.intel.com ([10.7.209.65])
by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
21 Jan 2021 09:22:57 -0800
IronPort-SDR: pF0zltpWvOJ1O7ufS2jZIwmruwIL4L+D0n6pZWdDMf3JymD34GNNg6RCw6XUmVOOsaJ27+8n1n
MYl6FZIhec6A==
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.79,364,1602572400"; d="scan'208";a="385386781"
Received: from silpixa00399952.ir.intel.com (HELO
silpixa00399952.ger.corp.intel.com) ([10.237.222.38])
by orsmga008.jf.intel.com with ESMTP; 21 Jan 2021 09:22:56 -0800
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>
Date: Thu, 21 Jan 2021 17:22:01 +0000
Message-Id: <20210121172201.22582-7-david.hunt@intel.com>
X-Mailer: git-send-email 2.17.1
In-Reply-To: <20210121172201.22582-1-david.hunt@intel.com>
References: <20210120135556.33763-2-david.hunt@intel.com>
<20210121172201.22582-1-david.hunt@intel.com>
Subject: [dpdk-stable] [PATCH v4 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 <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
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