[dpdk-stable] patch 'net/virtio-user: drop attribute unused for memory callback' has been queued to LTS release 18.11.6

Kevin Traynor ktraynor at redhat.com
Wed Dec 11 22:26:52 CET 2019


Hi,

FYI, your patch has been queued to LTS release 18.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/17/19. 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/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/c269e973f9325690af27676edf648341462eb024

Thanks.

Kevin.

---
>From c269e973f9325690af27676edf648341462eb024 Mon Sep 17 00:00:00 2001
From: Tiwei Bie <tiwei.bie at intel.com>
Date: Tue, 19 Nov 2019 15:12:24 +0800
Subject: [PATCH] net/virtio-user: drop attribute unused for memory callback

[ upstream commit 2286291df1007a1447dd3fc854e12a790a8353ba ]

The "addr" param has been used since the event callbacks are enabled
for external memory. So the "__rte_unused" should be dropped.

Besides, slightly refine the coding style by consistently assuming
tabs are 8 characters.

Fixes: f32c7c9de961 ("malloc: enable event callbacks for external memory")

Signed-off-by: Tiwei Bie <tiwei.bie at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 drivers/net/virtio/virtio_user/virtio_user_dev.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c
index 8e8adf6bb..91536c667 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
@@ -307,7 +307,7 @@ virtio_user_fill_intr_handle(struct virtio_user_dev *dev)
 static void
 virtio_user_mem_event_cb(enum rte_mem_event type __rte_unused,
-						 const void *addr __rte_unused,
-						 size_t len __rte_unused,
-						 void *arg)
+			 const void *addr,
+			 size_t len __rte_unused,
+			 void *arg)
 {
 	struct virtio_user_dev *dev = arg;
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-11 21:24:17.403903979 +0000
+++ 0060-net-virtio-user-drop-attribute-unused-for-memory-cal.patch	2019-12-11 21:24:12.724650039 +0000
@@ -1 +1 @@
-From 2286291df1007a1447dd3fc854e12a790a8353ba Mon Sep 17 00:00:00 2001
+From c269e973f9325690af27676edf648341462eb024 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2286291df1007a1447dd3fc854e12a790a8353ba ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index a4400e772..ea016e85d 100644
+index 8e8adf6bb..91536c667 100644
@@ -25 +26 @@
-@@ -316,7 +316,7 @@ virtio_user_fill_intr_handle(struct virtio_user_dev *dev)
+@@ -307,7 +307,7 @@ virtio_user_fill_intr_handle(struct virtio_user_dev *dev)



More information about the stable mailing list