[dpdk-stable] patch 'bus/vmbus: stop mapping if empty resource found' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/01/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 can be viewed on the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
>From 8d8ac27e478619ed54b899a09afd81939a2f7f94 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <sthemmin at microsoft.com>
Date: Thu, 7 Feb 2019 19:44:04 -0800
Subject: [PATCH] bus/vmbus: stop mapping if empty resource found

[ upstream commit 41a7f8cbeeaf8cbaf23af6ed57ef49a926a2bd16 ]

If vmbus is run on older kernel (without all the uio mappings),
then the bus driver should stop when it hits the missing mappings
rather than recording the empty values.

Fixes: 831dba47bd36 ("bus/vmbus: add Hyper-V virtual bus support")

Signed-off-by: Stephen Hemminger <sthemmin at microsoft.com>
---
 drivers/bus/vmbus/vmbus_common_uio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/bus/vmbus/vmbus_common_uio.c b/drivers/bus/vmbus/vmbus_common_uio.c
index 46e233d9f..a6545b758 100644
--- a/drivers/bus/vmbus/vmbus_common_uio.c
+++ b/drivers/bus/vmbus/vmbus_common_uio.c
@@ -99,7 +99,7 @@ vmbus_uio_map_primary(struct rte_vmbus_device *dev)
 	/* Map the resources */
 	for (i = 0; i < VMBUS_MAX_RESOURCE; i++) {
-		/* skip empty BAR */
+		/* stop at empty BAR */
 		if (dev->resource[i].len == 0)
-			continue;
+			break;
 
 		ret = vmbus_uio_map_resource_by_index(dev, i, uio_res, 0);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:47.036149708 +0100
+++ 0006-bus-vmbus-stop-mapping-if-empty-resource-found.patch	2019-04-25 16:37:46.684296345 +0100
@@ -1 +1 @@
-From 41a7f8cbeeaf8cbaf23af6ed57ef49a926a2bd16 Mon Sep 17 00:00:00 2001
+From 8d8ac27e478619ed54b899a09afd81939a2f7f94 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 41a7f8cbeeaf8cbaf23af6ed57ef49a926a2bd16 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org