[dpdk-stable] patch 'vhost: fix build on RHEL 7.6 for Power' has been queued to LTS release 18.11.6

Kevin Traynor ktraynor at redhat.com
Tue Dec 10 15:59:13 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/16/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/035fed4684cb38eea4a406f7d594618b4d99f5b7

Thanks.

Kevin.

---
>From 035fed4684cb38eea4a406f7d594618b4d99f5b7 Mon Sep 17 00:00:00 2001
From: David Christensen <drc at linux.vnet.ibm.com>
Date: Wed, 14 Aug 2019 13:36:41 -0500
Subject: [PATCH] vhost: fix build on RHEL 7.6 for Power

[ upstream commit 4b462021b4c8b3fc4d01839761ed8dfaae4b39e4 ]

Use of %llx print formatting causes meson build error on Power systems with
RHEL 7.6 and gcc 4.8.5.  Replace with PRIx64 macro.

Fixes: 9b62e2da1844 ("vhost: register new regions with userfaultfd")

Signed-off-by: David Christensen <drc at linux.vnet.ibm.com>
Reviewed-by: Tiwei Bie <tiwei.bie at intel.com>
---
 lib/librte_vhost/vhost_user.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 1e148fb45..b5de73b4f 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -1207,8 +1207,9 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 			}
 			RTE_LOG(INFO, VHOST_CONFIG,
-				"\t userfaultfd registered for range : %llx - %llx\n",
-				reg_struct.range.start,
-				reg_struct.range.start +
-				reg_struct.range.len - 1);
+				"\t userfaultfd registered for range : "
+				"%" PRIx64 " - %" PRIx64 "\n",
+				(uint64_t)reg_struct.range.start,
+				(uint64_t)reg_struct.range.start +
+				(uint64_t)reg_struct.range.len - 1);
 #else
 			goto err_mmap;
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-10 14:49:41.722668600 +0000
+++ 0039-vhost-fix-build-on-RHEL-7.6-for-Power.patch	2019-12-10 14:49:39.070457432 +0000
@@ -1 +1 @@
-From 4b462021b4c8b3fc4d01839761ed8dfaae4b39e4 Mon Sep 17 00:00:00 2001
+From 035fed4684cb38eea4a406f7d594618b4d99f5b7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4b462021b4c8b3fc4d01839761ed8dfaae4b39e4 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 61ef699ac..2a9fa7c6c 100644
+index 1e148fb45..b5de73b4f 100644
@@ -22 +23 @@
-@@ -1164,8 +1164,9 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
+@@ -1207,8 +1207,9 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,



More information about the stable mailing list