commit 850deb842992de4b96797e6a8a9550ca24ef148c
author Tomasz Wiszkowski <ender@google.com> Mon Jul 10 13:44:24 2017 -0700
committer Greg Hartman <ghartman@google.com> Mon Oct 09 17:29:28 2017 -0700
tree 7bffae325764d762d6989934b0c27363b7445db6
parent a29455ea5d3b726322744c638d81870e7f1a58fb

Include e2e regions and drop redundant details from json file.

http://docs/document/d/1Km3nxRV96r0Iy6sV8TYSJ878jWcB4L2Oky98TI2w-ew

Change-Id: Ic7d9f73bc938397ee2246ce8914f07280f1327c8
(cherry picked from commit f4c1c54f06f958e48c0c0c5c5f5fa245979b9284)

ivserver/vsoc_mem.json

diff --git a/ivserver/vsoc_mem.json b/ivserver/vsoc_mem.json
index cfaceb5..16c2755 100644
--- a/ivserver/vsoc_mem.json
+++ b/ivserver/vsoc_mem.json
@@ -14,29 +14,24 @@
     ]
   },
   "vsoc_shm_layout_descriptor" : {
-    "comment": "The top level layout descriptor",
-    "major_version" : 0,
-    "minor_version" : 1,
-    "size": "<populated by querying the shm region size at runtime>",
-    "region_count" : 3,
+    "__comment": "The top level layout descriptor",
     "vsoc_region_desc_offset" : 128
   },
 
   "vsoc_device_regions" : [
    {
-     "comment" : "HWComposer related",
+     "__comment" : "HWComposer related",
      "current_version" : 1,
      "min_compatible_version" : 1,
      "region_begin_offset" : 4096,
      "region_end_offset" : 16384,
 
      "guest_to_host_signal_table" : {
-       "comment" : "",
+       "__comment" : "sizeof each node is based on common/libs/shm_compatible/loch.h",
        "num_nodes_lg2" : 2
       },
 
      "host_to_guest_signal_table" : {
-       "comment" : "",
        "num_nodes_lg2" : 2
       },
 
@@ -44,19 +39,17 @@
    },
 
    {
-     "comment" : "Sensors related",
+     "__comment" : "Sensors related",
      "current_version" : 1,
      "min_compatible_version" : 1,
      "region_begin_offset" : 20480,
      "region_end_offset" : 32768,
 
      "guest_to_host_signal_table" : {
-       "comment" : "sizeof each node is based on common/libs/shm_compatible/loch.h",
        "num_nodes_lg2" : 1
      },
 
      "host_to_guest_signal_table" : {
-       "comment" : "",
        "num_nodes_lg2" : 1
      },
 
@@ -64,23 +57,55 @@
    },
 
    {
-    "comment" : "Misc",
+    "__comment" : "Misc",
     "current_version" : 1,
     "min_compatible_version" : 1,
     "region_begin_offset" : 40960,
     "region_end_offset" : 65536,
 
     "guest_to_host_signal_table" : {
-      "comment" : "",
       "num_nodes_lg2" : 1
     },
 
     "host_to_guest_signal_table" : {
-      "comment" : "",
       "num_nodes_lg2" : 1
     },
 
     "device_name" : "misc"
+   },
+
+   {
+    "__comment" : "Sanity testing",
+    "device_name" : "e2e_primary",
+    "current_version" : 1,
+    "min_compatible_version" : 1,
+    "region_begin_offset" : 65536,
+    "region_end_offset" : 81920,
+
+    "guest_to_host_signal_table" : {
+      "num_nodes_lg2" : 1
+    },
+
+    "host_to_guest_signal_table" : {
+      "num_nodes_lg2" : 1
+    }
+   },
+
+   {
+    "__comment" : "Sanity testing",
+    "device_name" : "e2e_secondary",
+    "current_version" : 1,
+    "min_compatible_version" : 1,
+    "region_begin_offset" : 81920,
+    "region_end_offset" : 98304,
+
+    "guest_to_host_signal_table" : {
+      "num_nodes_lg2" : 1
+    },
+
+    "host_to_guest_signal_table" : {
+      "num_nodes_lg2" : 1
+    }
    }
   ]
 }

ivserver/vsocsharedmem.cc

diff --git a/ivserver/vsocsharedmem.cc b/ivserver/vsocsharedmem.cc
index dd86847..4e218ed 100644
--- a/ivserver/vsocsharedmem.cc
+++ b/ivserver/vsocsharedmem.cc
@@ -93,8 +93,7 @@
 
   // TODO(romitd): error checking and sanity.
   // TODO(romitd): Refactor
-  layout_descriptor.region_count =
-      json_root_["vsoc_shm_layout_descriptor"]["region_count"].asUInt();
+  layout_descriptor.region_count = json_root_["vsoc_device_regions"].size();
 
   layout_descriptor.vsoc_region_desc_offset =
       json_root_["vsoc_shm_layout_descriptor"]["vsoc_region_desc_offset"]