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 22C4BA0524 for ; Thu, 4 Feb 2021 12:36:49 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1C028240735; Thu, 4 Feb 2021 12:36:49 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 5AB8A240735 for ; Thu, 4 Feb 2021 12:36:48 +0100 (CET) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l7cwK-0005WZ-4w; Thu, 04 Feb 2021 11:36:48 +0000 From: Christian Ehrhardt To: Bruce Richardson Cc: David Hunt , dpdk stable Date: Thu, 4 Feb 2021 12:28:59 +0100 Message-Id: <20210204112954.2488123-84-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> References: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'power: create guest channel public header file' has been queued to stable release 19.11.7 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" Hi, FYI, your patch has been queued to stable release 19.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/06/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/844c5689d7d98fcb65e96edeaca1d9ca78945dff Thanks. Christian Ehrhardt --- >From 844c5689d7d98fcb65e96edeaca1d9ca78945dff 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 [ upstream commit 5f443cc0f905a9bf25f6274aff58e6e29f049466 ] 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") 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 a26315051b..c7d5bf5a87 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 1d00a6cf6c..4788d50cfa 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 0c2cc1374d..0f82bac604 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 5f64b83fb0..3df3626577 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 b984d55bc8..6eba632393 100644 --- a/lib/librte_power/guest_channel.c +++ b/lib/librte_power/guest_channel.c @@ -16,7 +16,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 025961606c..7633e62756 100644 --- a/lib/librte_power/guest_channel.h +++ b/lib/librte_power/guest_channel.h @@ -8,7 +8,7 @@ extern "C" { #endif -#include +#include /** * Connect to the Virtio-Serial VM end-point located in path. It is diff --git a/lib/librte_power/power_kvm_vm.c b/lib/librte_power/power_kvm_vm.c index 277ebbeaeb..fa177b57ec 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.30.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-04 12:04:31.524755809 +0100 +++ 0084-power-create-guest-channel-public-header-file.patch 2021-02-04 12:04:28.082789779 +0100 @@ -1 +1 @@ -From 5f443cc0f905a9bf25f6274aff58e6e29f049466 Mon Sep 17 00:00:00 2001 +From 844c5689d7d98fcb65e96edeaca1d9ca78945dff Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5f443cc0f905a9bf25f6274aff58e6e29f049466 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -29 +30 @@ -index 9dca6f6863..58a243b230 100644 +index a26315051b..c7d5bf5a87 100644 @@ -42 +43 @@ -index 228f06803d..08306105d3 100644 +index 1d00a6cf6c..4788d50cfa 100644 @@ -68 +69 @@ -index 6ad14a3dea..2299d23dce 100644 +index 0c2cc1374d..0f82bac604 100644 @@ -81 +82 @@ -index ed0623a41d..f7e1b596ec 100644 +index 5f64b83fb0..3df3626577 100644 @@ -94 +95 @@ -index 7b5926e5c4..4cb5ae1ddf 100644 +index b984d55bc8..6eba632393 100644 @@ -97 +98 @@ -@@ -17,7 +17,7 @@ +@@ -16,7 +16,7 @@ @@ -107 +108 @@ -index e15db46fc7..d3d87f0ae2 100644 +index 025961606c..7633e62756 100644 @@ -118 +119 @@ - * Check if any Virtio-Serial VM end-points exist in path. + * Connect to the Virtio-Serial VM end-point located in path. It is @@ -120 +121 @@ -index 409c3e03ab..649ebe85c4 100644 +index 277ebbeaeb..fa177b57ec 100644