[dpdk-stable] patch 'power: make channel message functions public' has been queued to stable release 19.11.7

[Christian Ehrhardt]

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/fe40cc37a81a7fbb430a583e8339f15641288857

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From fe40cc37a81a7fbb430a583e8339f15641288857 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Thu, 21 Jan 2021 17:21:57 +0000
Subject: [PATCH] power: make channel message functions public

[ upstream commit 4d3892dcd77b2f9dc657b426f4871f703cb819b6 ]

Move the 2 public functions into 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 <bruce.richardson at intel.com>
Signed-off-by: David Hunt <david.hunt at intel.com>
Acked-by: Anatoly Burakov <anatoly.burakov at intel.com>
---
 lib/librte_power/guest_channel.h           | 40 -----------------
 lib/librte_power/rte_power_guest_channel.h | 50 ++++++++++++++++++++++
 lib/librte_power/rte_power_version.map     |  4 ++
 3 files changed, 54 insertions(+), 40 deletions(-)

diff --git a/lib/librte_power/guest_channel.h b/lib/librte_power/guest_channel.h
index 7633e62756..a55d5e6d4c 100644
--- a/lib/librte_power/guest_channel.h
+++ b/lib/librte_power/guest_channel.h
@@ -53,22 +53,6 @@ void guest_channel_host_disconnect(unsigned int lcore_id);
  */
 int guest_channel_send_msg(struct channel_packet *pkt, unsigned int lcore_id);
 
-/**
- * Send a message contained in pkt over the Virtio-Serial to the host endpoint.
- *
- * @param pkt
- *  Pointer to a populated struct channel_packet
- *
- * @param lcore_id
- *  lcore_id.
- *
- * @return
- *  - 0 on success.
- *  - Negative on error.
- */
-int rte_power_guest_channel_send_msg(struct channel_packet *pkt,
-			unsigned int lcore_id);
-
 /**
  * Read a message contained in pkt over the Virtio-Serial
  * from the host endpoint.
@@ -91,30 +75,6 @@ int power_guest_channel_read_msg(void *pkt,
 		size_t pkt_len,
 		unsigned int lcore_id);
 
-/**
- * Receive a message contained in pkt over the Virtio-Serial
- * from the host endpoint.
- *
- * @param pkt
- *  Pointer to channel_packet or
- *  channel_packet_freq_list struct.
- *
- * @param pkt_len
- *  Size of expected data packet.
- *
- * @param lcore_id
- *  lcore_id.
- *
- * @return
- *  - 0 on success.
- *  - Negative on error.
- */
-__rte_experimental
-int
-rte_power_guest_channel_receive_msg(void *pkt,
-		size_t pkt_len,
-		unsigned int lcore_id);
-
 
 #ifdef __cplusplus
 }
diff --git a/lib/librte_power/rte_power_guest_channel.h b/lib/librte_power/rte_power_guest_channel.h
index ef3b064a85..c500c0cda6 100644
--- a/lib/librte_power/rte_power_guest_channel.h
+++ b/lib/librte_power/rte_power_guest_channel.h
@@ -116,6 +116,56 @@ struct channel_packet_caps_list {
 	uint8_t num_vcpu;
 };
 
+/**
+ * @internal
+ *
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Send a message contained in pkt over the Virtio-Serial to the host endpoint.
+ *
+ * @param pkt
+ *  Pointer to a populated struct channel_packet.
+ *
+ * @param lcore_id
+ *  Use channel specific to this lcore_id.
+ *
+ * @return
+ *  - 0 on success.
+ *  - Negative on error.
+ */
+__rte_experimental
+int rte_power_guest_channel_send_msg(struct channel_packet *pkt,
+			unsigned int lcore_id);
+
+/**
+ * @internal
+ *
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Receive a message contained in pkt over the Virtio-Serial
+ * from the host endpoint.
+ *
+ * @param pkt
+ *  Pointer to channel_packet or
+ *  channel_packet_freq_list struct.
+ *
+ * @param pkt_len
+ *  Size of expected data packet.
+ *
+ * @param lcore_id
+ *  Use channel specific to this lcore_id.
+ *
+ * @return
+ *  - 0 on success.
+ *  - Negative on error.
+ */
+__rte_experimental
+int rte_power_guest_channel_receive_msg(void *pkt,
+		size_t pkt_len,
+		unsigned int lcore_id);
+
 
 #ifdef __cplusplus
 }
diff --git a/lib/librte_power/rte_power_version.map b/lib/librte_power/rte_power_version.map
index 55a168f56e..0fe85377ab 100644
--- a/lib/librte_power/rte_power_version.map
+++ b/lib/librte_power/rte_power_version.map
@@ -33,4 +33,8 @@ EXPERIMENTAL {
 	rte_power_guest_channel_receive_msg;
 	rte_power_poll_stat_fetch;
 	rte_power_poll_stat_update;
+
+	# added in 21.02
+	rte_power_guest_channel_receive_msg;
+	rte_power_guest_channel_send_msg;
 };
-- 
2.30.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-04 12:04:31.566856709 +0100
+++ 0085-power-make-channel-message-functions-public.patch	2021-02-04 12:04:28.082789779 +0100
@@ -1 +1 @@
-From 4d3892dcd77b2f9dc657b426f4871f703cb819b6 Mon Sep 17 00:00:00 2001
+From fe40cc37a81a7fbb430a583e8339f15641288857 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4d3892dcd77b2f9dc657b426f4871f703cb819b6 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
- lib/librte_power/version.map               |  4 ++
+ lib/librte_power/rte_power_version.map     |  4 ++
@@ -22 +23 @@
-index d3d87f0ae2..83186cfbba 100644
+index 7633e62756..a55d5e6d4c 100644
@@ -25 +26 @@
-@@ -65,22 +65,6 @@ void guest_channel_host_disconnect(unsigned int lcore_id);
+@@ -53,22 +53,6 @@ void guest_channel_host_disconnect(unsigned int lcore_id);
@@ -48 +49 @@
-@@ -103,30 +87,6 @@ int power_guest_channel_read_msg(void *pkt,
+@@ -91,30 +75,6 @@ int power_guest_channel_read_msg(void *pkt,
@@ -140,5 +141,5 @@
-diff --git a/lib/librte_power/version.map b/lib/librte_power/version.map
-index 69ca9af616..13f0af3b2d 100644
---- a/lib/librte_power/version.map
-+++ b/lib/librte_power/version.map
-@@ -34,4 +34,8 @@ EXPERIMENTAL {
+diff --git a/lib/librte_power/rte_power_version.map b/lib/librte_power/rte_power_version.map
+index 55a168f56e..0fe85377ab 100644
+--- a/lib/librte_power/rte_power_version.map
++++ b/lib/librte_power/rte_power_version.map
+@@ -33,4 +33,8 @@ EXPERIMENTAL {