From: Gabriel Ganne <gabriel.ganne@enea.com>
Date: Thu, 11 Jan 2018 14:04:19 +0000 (+0100)
Subject: vabits - subtract from the 'end' address instead of from 'bits'.
X-Git-Tag: v18.04-rc1~492
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F75%2F10075%2F2;p=vpp.git

vabits - subtract from the 'end' address instead of from 'bits'.

This is a fixup for the commits on
calc base address on AArch64 based on autodetected VA space size

As reported by: Brian Brooks <brian.brooks@arm.com>
Signed-off-by: Gabriel Ganne <gabriel.ganne@enea.com>
Change-Id: Id1bd7b7d7e5c188d8547c46134082bd4563b92db
---

diff --git a/src/svm/svm.c b/src/svm/svm.c
index 2cbc0d77c22..d3e56c1a46a 100644
--- a/src/svm/svm.c
+++ b/src/svm/svm.c
@@ -76,14 +76,15 @@ svm_get_global_region_base_va ()
   unformat_init_clib_file (&input, fd);
   while (unformat_check_input (&input) != UNFORMAT_END_OF_INPUT)
     {
-      unformat (&input, "%llx-%llx", &start, &end);
+      if (unformat (&input, "%llx-%llx", &start, &end))
+	end--;
       unformat_skip_line (&input);
     }
   unformat_free (&input);
   close (fd);
 
   count_leading_zeros (bits, end);
-  bits = 64 - (bits + 1);
+  bits = 64 - bits;
   if (bits >= 36 && bits <= 48)
     return ((1ul << bits) / 4) - (2 * SVM_GLOBAL_REGION_SIZE);
   else