commit 60a965d6eba32fd011ee4181112e58ab2800b2ad
author Greg Hartman <ghartman@google.com> Thu Jun 29 11:22:37 2017 -0700
committer Greg Hartman <ghartman@google.com> Mon Oct 09 17:29:27 2017 -0700
tree 49a668954378829fb510cb783e514249265ba1e1
parent bdf23b52219fad3a3249f8764155c9ade615d740

Region changes for end-to-end tests

Change-Id: I0010b2685c09fa97d9e9b3aa7b8af6fa8858d3d2
(cherry picked from commit de9481fc7f77e0f3c4a2618729f5dff8d7d468f4)

launcher/vsoc_mem.json

diff --git a/launcher/vsoc_mem.json b/launcher/vsoc_mem.json
index a32be9d..eab8805 100644
--- a/launcher/vsoc_mem.json
+++ b/launcher/vsoc_mem.json
@@ -15,32 +15,52 @@
   },
 
   "version" : "1",
-  "comment" : "The first page should be reserved for top level headers and region descriptors only",
+  "__comment" : "The first page should be reserved for top level headers and region descriptors only",
   "size" : "4194304",
-  "region_count" : "3",
+  "region_count" : "4",
 
   "vsoc_shm_layout_descriptor" : {
-    "comment": "The top level layout descriptor",
+    "__comment": "The top level layout descriptor",
     "size": "<populated by querying the shm region size at runtime>",
-    "region_count" : "3",
+    "region_count" : "4",
     "vsoc_region_desc_offset" : "128"
   },
 
   "vsoc_device_regions" : [
    {
-     "comment" : "HWComposer",
+     "__comment" : "Primary end to end test region",
      "current_version" : "1",
      "min_compatible_version" : "1",
      "region_begin_offset" : "4096",
-     "region_end_offset" : "16384",
+     "region_end_offset" : "8192",
 
      "guest_to_host_signal_table" : {
-       "comment" : "",
+       "__comment" : "",
        "num_nodes_lg2" : "2"
      },
 
      "host_to_guest_signal_table" : {
-       "comment" : "",
+       "__comment" : "",
+       "num_nodes_lg2" : "2"
+     },
+
+     "device_name" : "e2e_primary"
+   },
+
+   {
+     "__comment" : "HWComposer",
+     "current_version" : "1",
+     "min_compatible_version" : "1",
+     "region_begin_offset" : "8192",
+     "region_end_offset" : "16384",
+
+     "guest_to_host_signal_table" : {
+       "__comment" : "",
+       "num_nodes_lg2" : "2"
+     },
+
+     "host_to_guest_signal_table" : {
+       "__comment" : "",
        "num_nodes_lg2" : "2"
      },
 
@@ -48,42 +68,42 @@
    },
 
    {
-     "comment" : "Sensors",
+     "__comment" : "Sensors",
      "current_version" : "1",
      "min_compatible_version" : "1",
      "region_begin_offset" : "16384",
      "region_end_offset" : "32768",
 
      "guest_to_host_signal_table" : {
-       "comment" : "each node is the size of a unit32_t. See vsoc_shm.h line 81",
+       "__comment" : "each node is the size of a unit32_t. See vsoc_shm.h line 81",
        "num_nodes_lg2" : "1"
      },
 
      "host_to_guest_signal_table" : {
-       "comment" : "",
+       "__comment" : "",
        "num_nodes_lg2" : "1"
      },
 
      "device_name" : "sensors"
    },
    {
-    "comment" : "Misc",
+    "__comment" : "e2e_secondary",
     "current_version" : "1",
     "min_compatible_version" : "1",
     "region_begin_offset" : "32768",
     "region_end_offset" : "36864",
 
     "guest_to_host_signal_table" : {
-      "comment" : "",
+      "__comment" : "",
       "num_nodes_lg2" : "1"
     },
 
     "host_to_guest_signal_table" : {
-      "comment" : "",
+      "__comment" : "",
       "num_nodes_lg2" : "1"
     },
 
-    "device_name" : "misc"
+    "device_name" : "e2e_secondary"
    }
   ]
 }