[dpdk-stable] patch 'vhost: fix packed ring constants declaration' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.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 12/08/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From ed3f45987250ac5a9c4ff49024e38c218c5e2dcb Mon Sep 17 00:00:00 2001
From: Maxime Coquelin <maxime.coquelin at redhat.com>
Date: Thu, 22 Nov 2018 18:09:22 +0100
Subject: [PATCH] vhost: fix packed ring constants declaration

[ upstream commit 5a12b67e74989f582cfa21bb2129ce838eb18805 ]

The packed ring defines were declared only if kernel
header does not declare them.
The problem is that they are not applied in upstream kernel,
and some changes in the names have been required.

This patch declares the defines unconditionally, which
fixes potential build issues.

Fixes: 297b1e7350f6 ("vhost: add virtio packed virtqueue defines")

Signed-off-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 lib/librte_vhost/vhost.h | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
index 25ffd7614..9ac607bad 100644
--- a/lib/librte_vhost/vhost.h
+++ b/lib/librte_vhost/vhost.h
@@ -220,11 +220,4 @@ struct vhost_msg {
 #define VIRTIO_F_RING_PACKED 34
 
-#define VRING_DESC_F_NEXT	1
-#define VRING_DESC_F_WRITE	2
-#define VRING_DESC_F_INDIRECT	4
-
-#define VRING_DESC_F_AVAIL	(1ULL << 7)
-#define VRING_DESC_F_USED	(1ULL << 15)
-
 struct vring_packed_desc {
 	uint64_t addr;
@@ -234,14 +227,21 @@ struct vring_packed_desc {
 };
 
+struct vring_packed_desc_event {
+	uint16_t off_wrap;
+	uint16_t flags;
+};
+#endif
+
+/*
+ * Declare below packed ring defines unconditionally
+ * as Kernel header might use different names.
+ */
+#define VRING_DESC_F_AVAIL	(1ULL << 7)
+#define VRING_DESC_F_USED	(1ULL << 15)
+
 #define VRING_EVENT_F_ENABLE 0x0
 #define VRING_EVENT_F_DISABLE 0x1
 #define VRING_EVENT_F_DESC 0x2
 
-struct vring_packed_desc_event {
-	uint16_t off_wrap;
-	uint16_t flags;
-};
-#endif
-
 /*
  * Available and used descs are in same order
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-29 13:11:36.995539140 +0000
+++ 0078-vhost-fix-packed-ring-constants-declaration.patch	2018-11-29 13:11:35.000000000 +0000
@@ -1,8 +1,10 @@
-From 5a12b67e74989f582cfa21bb2129ce838eb18805 Mon Sep 17 00:00:00 2001
+From ed3f45987250ac5a9c4ff49024e38c218c5e2dcb Mon Sep 17 00:00:00 2001
 From: Maxime Coquelin <maxime.coquelin at redhat.com>
 Date: Thu, 22 Nov 2018 18:09:22 +0100
 Subject: [PATCH] vhost: fix packed ring constants declaration
 
+[ upstream commit 5a12b67e74989f582cfa21bb2129ce838eb18805 ]
+
 The packed ring defines were declared only if kernel
 header does not declare them.
 The problem is that they are not applied in upstream kernel,
@@ -12,7 +14,6 @@
 fixes potential build issues.
 
 Fixes: 297b1e7350f6 ("vhost: add virtio packed virtqueue defines")
-Cc: stable at dpdk.org
 
 Signed-off-by: Maxime Coquelin <maxime.coquelin at redhat.com>
 ---
@@ -20,7 +21,7 @@
  1 file changed, 13 insertions(+), 13 deletions(-)
 
 diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
-index 760f42192..5218f1b12 100644
+index 25ffd7614..9ac607bad 100644
 --- a/lib/librte_vhost/vhost.h
 +++ b/lib/librte_vhost/vhost.h
 @@ -220,11 +220,4 @@ struct vhost_msg {