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 E3E44A0524 for ; Fri, 5 Feb 2021 12:35:44 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DE817188A2C; Fri, 5 Feb 2021 12:35:44 +0100 (CET) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mails.dpdk.org (Postfix) with ESMTP id 859791889FD for ; Fri, 5 Feb 2021 12:35:44 +0100 (CET) Received: by mail-wm1-f46.google.com with SMTP id u14so5640055wmq.4 for ; Fri, 05 Feb 2021 03:35:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LH6Rl3APnS+bNdZ2vehsc4Mb5/ZO7aSrIvwVnjRdvNg=; b=PXv58W4UkmC6zApC+5+Zfzy2C0WszsI6/lYLreShqZBLvW2ztYiCHlrIi/w4WIB6v5 WtklsPQ2DAegZSRwKs5wVsRh8zCFB+YV1+XgikM7ZIJz8ptYiJHLWIR84CkeuLT8Fnbw g6U5MkRvWB8D0p21AI2EqFci/G/S0JrXKlvJiVBPAO4h8iXcgZaPv3JUo5TT/jUwXK16 /WUIZweLTzvHIEOL+AT27r+mZvkfVv0Qu7YRFIKbzkuxWRdk9qHPLFJCfLe5doa6t+3a 6PghrbHK6l3ak+pX30hEHHpg4qeUNODFhbSoQN70+ytF1t7RmdOpSMrCptnTi6T62KLp SRQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LH6Rl3APnS+bNdZ2vehsc4Mb5/ZO7aSrIvwVnjRdvNg=; b=KC+EF4joGGcB4nn5tDVTpezDuEvk8nCc4RHpLIxbmQJBtSMvwitAohnvGWTVbAV0zq KA/oH9GNKCLHQI/aiTnRCQZ3FDdbXibWpmfxa7ZJElVsPVfX8ymnpqsksLLL50Q7Fyiv orxdOm3Rat9u3aUIEadNO59mUOTvxXx2O+9rz/XLfib3Jie+y7+Op8moqwvJVQoLsnOP f/HYTt+Lvw0AWaohjGMjAX9KGxaQMf7YYdfYKKHqbmVSsr9xgEQT7ppK9LeZG4jW3/lT ipiowsZFdSyHVgsDWUkto/2gT4KQbx46U41WcDausfYxnKYo0Gk0stn1k4sCyvcHPpL7 BFPw== X-Gm-Message-State: AOAM532k4gP9Kg0kCUy1SnRYLGVqMonf0PNxyVg8uEJY0ZW2lig+xdin RoaPlcZewzT58RHJtt/EhWk= X-Google-Smtp-Source: ABdhPJw2vkUxb39EWEnn7LWx58DqozmRVfrk2o/JqtRZGAcfBmrgAzROxLt4axmxyI5Obvj/w4Rmtw== X-Received: by 2002:a1c:8096:: with SMTP id b144mr3273677wmd.169.1612524944317; Fri, 05 Feb 2021 03:35:44 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id p12sm8133021wmq.1.2021.02.05.03.35.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:35:43 -0800 (PST) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: David Hunt , dpdk stable Date: Fri, 5 Feb 2021 11:18:04 +0000 Message-Id: <20210205111920.1272063-198-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.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 20.11.1 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 20.11.1 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/07/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/74d0a5daad7db604836d8054850411cb96915b53 Thanks. Luca Boccassi --- >From 74d0a5daad7db604836d8054850411cb96915b53 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 228f06803d..08306105d3 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 6ad14a3dea..2299d23dce 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 ed0623a41d..f7e1b596ec 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 7b5926e5c4..4cb5ae1ddf 100644 --- a/lib/librte_power/guest_channel.c +++ b/lib/librte_power/guest_channel.c @@ -17,7 +17,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 e15db46fc7..d3d87f0ae2 100644 --- a/lib/librte_power/guest_channel.h +++ b/lib/librte_power/guest_channel.h @@ -8,7 +8,7 @@ extern "C" { #endif -#include +#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 409c3e03ab..649ebe85c4 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.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:38.010178559 +0000 +++ 0198-power-create-guest-channel-public-header-file.patch 2021-02-05 11:18:29.154697738 +0000 @@ -1 +1 @@ -From 5f443cc0f905a9bf25f6274aff58e6e29f049466 Mon Sep 17 00:00:00 2001 +From 74d0a5daad7db604836d8054850411cb96915b53 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