From cf05e37c857458901f8a32f8ad5bc90cc70d770f Mon Sep 17 00:00:00 2001
From: Chenli Wei <chenli.wei@intel.com>
Date: Wed, 20 Apr 2022 11:15:48 +0800
Subject: [PATCH] config_tools: refine XMLs setting for HPAn

1. After the data structure of vm/memory in scenario and schema files.
The scenario will look like this.

<hpa_region>
  <start_hpa>xxx</start_hpa>
  <size_hpa>xxx</size_hpa>
</hpa_region>

We should change all XMLs for the new design.

Tracked-On: #6690
Signed-off-by: Chenli Wei <chenli.wei@intel.com>
---
 .../cfl-k700-i7/hybrid_launch_2user_vm.xml     | 15 ++++++---------
 .../data/cfl-k700-i7/hybrid_rt.xml             | 13 +++++--------
 .../data/cfl-k700-i7/partitioned.xml           | 18 +++++++++---------
 .../cfl-k700-i7/shared_launch_6user_vm.xml     | 16 ++++++----------
 .../generic_board/hybrid_launch_2user_vm.xml   | 15 ++++++---------
 .../data/generic_board/hybrid_rt.xml           | 11 ++++-------
 .../data/generic_board/partitioned.xml         | 16 ++++++++--------
 .../generic_board/shared_launch_6user_vm.xml   | 16 ++++++----------
 .../data/nuc11tnbi5/hybrid_launch_2user_vm.xml | 15 ++++++---------
 .../data/nuc11tnbi5/partitioned.xml            | 16 ++++++++--------
 .../data/nuc11tnbi5/shared_launch_6user_vm.xml | 16 ++++++----------
 misc/config_tools/data/qemu/shared.xml         |  3 ---
 .../data/tgl-vecow-spc-7100-Corei7/hybrid.xml  | 11 ++++-------
 .../tgl-vecow-spc-7100-Corei7/partitioned.xml  | 16 ++++++++--------
 .../shared_launch_2user_vm.xml                 |  8 ++------
 misc/config_tools/data/whl-ipc-i5/hybrid.xml   | 11 ++++-------
 .../hybrid_rt_launch_1user_vm_waag.xml         | 13 +++++--------
 .../data/whl-ipc-i5/partitioned.xml            | 16 ++++++++--------
 .../shared_launch_1user_vm_hardrt.xml          |  6 +-----
 .../shared_launch_1user_vm_vxworks.xml         |  6 +-----
 .../whl-ipc-i5/shared_launch_1user_vm_waag.xml |  6 +-----
 .../data/whl-ipc-i5/shared_launch_2user_vm.xml |  8 ++------
 .../data/whl-ipc-i5/shared_launch_6user_vm.xml | 16 ++++++----------
 23 files changed, 112 insertions(+), 175 deletions(-)

diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml b/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml
index 61b3f047e..247add19a 100644
--- a/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml
+++ b/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml
@@ -81,10 +81,10 @@
       <size>0</size>
     </epc_section>
     <memory>
-      <start_hpa>0x100000000</start_hpa>
-      <size>0x20000000</size>
-      <start_hpa2>0x0</start_hpa2>
-      <size_hpa2>0x0</size_hpa2>
+      <hpa_region>
+        <start_hpa>0x100000000</start_hpa>
+        <size_hpa>512</size_hpa>
+      </hpa_region>
     </memory>
     <os_config>
       <kern_type>KERNEL_ELF</kern_type>
@@ -119,9 +119,6 @@
       <vcpu_clos>0</vcpu_clos>
       <vcpu_clos>0</vcpu_clos>
     </clos>
-    <memory>
-      <start_hpa>0</start_hpa>
-    </memory>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
@@ -145,7 +142,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>4096</whole>
+      <size>4096</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <pci_devs>
@@ -179,7 +176,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>512</whole>
+      <size>512</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <PTM>n</PTM>
diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
index f1043049c..03a2055f9 100644
--- a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
+++ b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
@@ -96,10 +96,10 @@
       <size>0</size>
     </epc_section>
     <memory>
-      <start_hpa>0x100000000</start_hpa>
-      <size>0x40000000</size>
-      <start_hpa2>0x0</start_hpa2>
-      <size_hpa2>0x0</size_hpa2>
+      <hpa_region>
+        <start_hpa>0x100000000</start_hpa>
+        <size_hpa>1024</size_hpa>
+      </hpa_region>
     </memory>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
@@ -151,9 +151,6 @@
       <vcpu_clos>0</vcpu_clos>
       <vcpu_clos>0</vcpu_clos>
     </clos>
-    <memory>
-      <start_hpa>0</start_hpa>
-    </memory>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
@@ -204,4 +201,4 @@
     <console_vuart>COM Port 1</console_vuart>
     <PTM>n</PTM>
   </vm>
-</acrn-config>
\ No newline at end of file
+</acrn-config>
diff --git a/misc/config_tools/data/cfl-k700-i7/partitioned.xml b/misc/config_tools/data/cfl-k700-i7/partitioned.xml
index 549231e66..e6a23d25c 100644
--- a/misc/config_tools/data/cfl-k700-i7/partitioned.xml
+++ b/misc/config_tools/data/cfl-k700-i7/partitioned.xml
@@ -85,10 +85,10 @@
       <size>0</size>
     </epc_section>
     <memory>
-      <start_hpa>0x100000000</start_hpa>
-      <size>0x20000000</size>
-      <start_hpa2>0x0</start_hpa2>
-      <size_hpa2>0x0</size_hpa2>
+      <hpa_region>
+        <start_hpa>0x100000000</start_hpa>
+        <size_hpa>512</size_hpa>
+      </hpa_region>
     </memory>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
@@ -127,10 +127,10 @@
       <size>0</size>
     </epc_section>
     <memory>
-      <start_hpa>0x120000000</start_hpa>
-      <size>0x20000000</size>
-      <start_hpa2>0x0</start_hpa2>
-      <size_hpa2>0x0</size_hpa2>
+      <hpa_region>
+        <start_hpa>0x120000000</start_hpa>
+        <size_hpa>512</size_hpa>
+      </hpa_region>
     </memory>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
@@ -148,4 +148,4 @@
       <pci_dev>00:14.0 USB controller: Intel Corporation Cannon Lake PCH USB 3.1 xHCI Host Controller (rev 10)</pci_dev>
     </pci_devs>
   </vm>
-</acrn-config>
\ No newline at end of file
+</acrn-config>
diff --git a/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml b/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml
index 683616965..254b48d07 100644
--- a/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml
+++ b/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml
@@ -63,10 +63,6 @@
     <clos>
       <vcpu_clos>0</vcpu_clos>
     </clos>
-    <memory>
-      <start_hpa>0</start_hpa>
-      <size>0x20000000</size>
-    </memory>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
@@ -93,7 +89,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>4096</whole>
+      <size>4096</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <pci_devs>
@@ -134,7 +130,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>1024</whole>
+      <size>1024</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <PTM>n</PTM>
@@ -172,7 +168,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>512</whole>
+      <size>512</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <PTM>n</PTM>
@@ -210,7 +206,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>512</whole>
+      <size>512</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <PTM>n</PTM>
@@ -248,7 +244,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>512</whole>
+      <size>512</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <PTM>n</PTM>
@@ -286,7 +282,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>512</whole>
+      <size>512</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <PTM>n</PTM>
diff --git a/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml b/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml
index 3796e80b7..75e4008a9 100644
--- a/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml
+++ b/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml
@@ -81,10 +81,10 @@
       <size>0</size>
     </epc_section>
     <memory>
-      <start_hpa>0x100000000</start_hpa>
-      <size>0x20000000</size>
-      <start_hpa2>0x0</start_hpa2>
-      <size_hpa2>0x0</size_hpa2>
+      <hpa_region>
+        <start_hpa>0x100000000</start_hpa>
+        <size_hpa>512</size_hpa>
+      </hpa_region>
     </memory>
     <os_config>
       <kern_type>KERNEL_ELF</kern_type>
@@ -120,9 +120,6 @@
       <vcpu_clos>0</vcpu_clos>
       <vcpu_clos>0</vcpu_clos>
     </clos>
-    <memory>
-      <start_hpa>0</start_hpa>
-    </memory>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
@@ -145,7 +142,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>4096</whole>
+      <size>4096</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <pci_devs>
@@ -179,7 +176,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>512</whole>
+      <size>512</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <PTM>n</PTM>
diff --git a/misc/config_tools/data/generic_board/hybrid_rt.xml b/misc/config_tools/data/generic_board/hybrid_rt.xml
index ad23e1cff..c5ae43494 100644
--- a/misc/config_tools/data/generic_board/hybrid_rt.xml
+++ b/misc/config_tools/data/generic_board/hybrid_rt.xml
@@ -109,10 +109,10 @@
       <size>0</size>
     </epc_section>
     <memory>
-      <start_hpa>0x100000000</start_hpa>
-      <size>0x40000000</size>
-      <start_hpa2>0x0</start_hpa2>
-      <size_hpa2>0x0</size_hpa2>
+      <hpa_region>
+        <start_hpa>0x100000000</start_hpa>
+        <size_hpa>1024</size_hpa>
+      </hpa_region>
     </memory>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
@@ -145,9 +145,6 @@
       <vcpu_clos>0</vcpu_clos>
       <vcpu_clos>0</vcpu_clos>
     </clos>
-    <memory>
-      <start_hpa>0</start_hpa>
-    </memory>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
diff --git a/misc/config_tools/data/generic_board/partitioned.xml b/misc/config_tools/data/generic_board/partitioned.xml
index d9638d70e..e4b8f061b 100644
--- a/misc/config_tools/data/generic_board/partitioned.xml
+++ b/misc/config_tools/data/generic_board/partitioned.xml
@@ -85,10 +85,10 @@
       <size>0</size>
     </epc_section>
     <memory>
-      <start_hpa>0x100000000</start_hpa>
-      <size>0x20000000</size>
-      <start_hpa2>0x0</start_hpa2>
-      <size_hpa2>0x0</size_hpa2>
+      <hpa_region>
+        <start_hpa>0x100000000</start_hpa>
+        <size_hpa>512</size_hpa>
+      </hpa_region>
     </memory>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
@@ -127,10 +127,10 @@
       <size>0</size>
     </epc_section>
     <memory>
-      <start_hpa>0x120000000</start_hpa>
-      <size>0x20000000</size>
-      <start_hpa2>0x0</start_hpa2>
-      <size_hpa2>0x0</size_hpa2>
+      <hpa_region>
+        <start_hpa>0x120000000</start_hpa>
+        <size_hpa>512</size_hpa>
+      </hpa_region>
     </memory>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
diff --git a/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml b/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml
index 6fa5b600f..d4ae3d096 100644
--- a/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml
+++ b/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml
@@ -71,10 +71,6 @@
     <clos>
       <vcpu_clos>0</vcpu_clos>
     </clos>
-    <memory>
-      <start_hpa>0</start_hpa>
-      <size>0x20000000</size>
-    </memory>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
@@ -101,7 +97,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>4096</whole>
+      <size>4096</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <pci_devs>
@@ -142,7 +138,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>1024</whole>
+      <size>1024</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <PTM>n</PTM>
@@ -180,7 +176,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>512</whole>
+      <size>512</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <PTM>n</PTM>
@@ -218,7 +214,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>512</whole>
+      <size>512</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <PTM>n</PTM>
@@ -256,7 +252,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>512</whole>
+      <size>512</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <PTM>n</PTM>
@@ -294,7 +290,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>512</whole>
+      <size>512</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <PTM>n</PTM>
diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml b/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml
index 08ac293fe..8e202ad0b 100644
--- a/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml
+++ b/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml
@@ -81,10 +81,10 @@
       <size>0</size>
     </epc_section>
     <memory>
-      <start_hpa>0x100000000</start_hpa>
-      <size>0x20000000</size>
-      <start_hpa2>0x0</start_hpa2>
-      <size_hpa2>0x0</size_hpa2>
+      <hpa_region>
+        <start_hpa>0x100000000</start_hpa>
+        <size_hpa>512</size_hpa>
+      </hpa_region>
     </memory>
     <os_config>
       <kern_type>KERNEL_ELF</kern_type>
@@ -120,9 +120,6 @@
       <vcpu_clos>0</vcpu_clos>
       <vcpu_clos>0</vcpu_clos>
     </clos>
-    <memory>
-      <start_hpa>0</start_hpa>
-    </memory>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
@@ -145,7 +142,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>4096</whole>
+      <size>4096</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <pci_devs>
@@ -179,7 +176,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>512</whole>
+      <size>512</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <PTM>n</PTM>
diff --git a/misc/config_tools/data/nuc11tnbi5/partitioned.xml b/misc/config_tools/data/nuc11tnbi5/partitioned.xml
index 275c2703b..b89739572 100644
--- a/misc/config_tools/data/nuc11tnbi5/partitioned.xml
+++ b/misc/config_tools/data/nuc11tnbi5/partitioned.xml
@@ -85,10 +85,10 @@
       <size>0</size>
     </epc_section>
     <memory>
-      <start_hpa>0x100000000</start_hpa>
-      <size>0x20000000</size>
-      <start_hpa2>0x0</start_hpa2>
-      <size_hpa2>0x0</size_hpa2>
+      <hpa_region>
+        <start_hpa>0x100000000</start_hpa>
+        <size_hpa>512</size_hpa>
+      </hpa_region>
     </memory>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
@@ -127,10 +127,10 @@
       <size>0</size>
     </epc_section>
     <memory>
-      <start_hpa>0x120000000</start_hpa>
-      <size>0x20000000</size>
-      <start_hpa2>0x0</start_hpa2>
-      <size_hpa2>0x0</size_hpa2>
+      <hpa_region>
+        <start_hpa>0x120000000</start_hpa>
+        <size_hpa>512</size_hpa>
+      </hpa_region>
     </memory>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
diff --git a/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml b/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml
index 8be36e0af..66df7202f 100644
--- a/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml
+++ b/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml
@@ -83,10 +83,6 @@
     <clos>
       <vcpu_clos>0</vcpu_clos>
     </clos>
-    <memory>
-      <start_hpa>0</start_hpa>
-      <size>0x20000000</size>
-    </memory>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
@@ -113,7 +109,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>4096</whole>
+      <size>4096</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <pci_devs>
@@ -154,7 +150,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>1024</whole>
+      <size>1024</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <PTM>n</PTM>
@@ -192,7 +188,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>512</whole>
+      <size>512</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <PTM>n</PTM>
@@ -230,7 +226,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>512</whole>
+      <size>512</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <PTM>n</PTM>
@@ -268,7 +264,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>512</whole>
+      <size>512</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <PTM>n</PTM>
@@ -306,7 +302,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>512</whole>
+      <size>512</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <PTM>n</PTM>
diff --git a/misc/config_tools/data/qemu/shared.xml b/misc/config_tools/data/qemu/shared.xml
index d490e9d34..1121583b9 100644
--- a/misc/config_tools/data/qemu/shared.xml
+++ b/misc/config_tools/data/qemu/shared.xml
@@ -64,9 +64,6 @@
     <clos>
       <vcpu_clos>0</vcpu_clos>
     </clos>
-    <memory>
-      <start_hpa>0</start_hpa>
-    </memory>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml
index 24cade1fc..3235af215 100644
--- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml
+++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml
@@ -81,10 +81,10 @@
       <size>0</size>
     </epc_section>
     <memory>
-      <start_hpa>0x100000000</start_hpa>
-      <size>0x20000000</size>
-      <start_hpa2>0x0</start_hpa2>
-      <size_hpa2>0x0</size_hpa2>
+      <hpa_region>
+        <start_hpa>0x100000000</start_hpa>
+        <size_hpa>512</size_hpa>
+      </hpa_region>
     </memory>
     <os_config>
       <kern_type>KERNEL_ELF</kern_type>
@@ -120,9 +120,6 @@
       <vcpu_clos>0</vcpu_clos>
       <vcpu_clos>0</vcpu_clos>
     </clos>
-    <memory>
-      <start_hpa>0</start_hpa>
-    </memory>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml
index 2a140acce..bbec53f3f 100644
--- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml
+++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml
@@ -85,10 +85,10 @@
       <size>0</size>
     </epc_section>
     <memory>
-      <start_hpa>0x100000000</start_hpa>
-      <size>0x20000000</size>
-      <start_hpa2>0x0</start_hpa2>
-      <size_hpa2>0x0</size_hpa2>
+      <hpa_region>
+        <start_hpa>0x100000000</start_hpa>
+        <size_hpa>512</size_hpa>
+      </hpa_region>
     </memory>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
@@ -127,10 +127,10 @@
       <size>0</size>
     </epc_section>
     <memory>
-      <start_hpa>0x120000000</start_hpa>
-      <size>0x20000000</size>
-      <start_hpa2>0x0</start_hpa2>
-      <size_hpa2>0x0</size_hpa2>
+      <hpa_region>
+        <start_hpa>0x120000000</start_hpa>
+        <size_hpa>512</size_hpa>
+      </hpa_region>
     </memory>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml
index 94ada0c2f..360867116 100644
--- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml
+++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml
@@ -83,10 +83,6 @@
     <clos>
       <vcpu_clos>0</vcpu_clos>
     </clos>
-    <memory>
-      <start_hpa>0</start_hpa>
-      <size>0x20000000</size>
-    </memory>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
@@ -114,7 +110,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>4096</whole>
+      <size>4096</size>
     </memory>
     <priority>PRIO_LOW</priority>
     <console_vuart>COM Port 1</console_vuart>
@@ -159,7 +155,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>1024</whole>
+      <size>1024</size>
     </memory>
     <priority>PRIO_LOW</priority>
     <console_vuart>COM Port 1</console_vuart>
diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid.xml b/misc/config_tools/data/whl-ipc-i5/hybrid.xml
index bb8664049..ce18ce119 100644
--- a/misc/config_tools/data/whl-ipc-i5/hybrid.xml
+++ b/misc/config_tools/data/whl-ipc-i5/hybrid.xml
@@ -73,10 +73,10 @@
       <size>0</size>
     </epc_section>
     <memory>
-      <start_hpa>0x100000000</start_hpa>
-      <size>0x20000000</size>
-      <start_hpa2>0x0</start_hpa2>
-      <size_hpa2>0x0</size_hpa2>
+      <hpa_region>
+        <start_hpa>0x100000000</start_hpa>
+        <size_hpa>512</size_hpa>
+      </hpa_region>
     </memory>
     <os_config>
       <kern_type>KERNEL_ELF</kern_type>
@@ -110,9 +110,6 @@
       <vcpu_clos>0</vcpu_clos>
       <vcpu_clos>0</vcpu_clos>
     </clos>
-    <memory>
-      <start_hpa>0</start_hpa>
-    </memory>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml b/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml
index 789e0fbf1..d3981b413 100644
--- a/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml
+++ b/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml
@@ -96,10 +96,10 @@
       <size>0</size>
     </epc_section>
     <memory>
-      <start_hpa>0x100000000</start_hpa>
-      <size>0x40000000</size>
-      <start_hpa2>0x0</start_hpa2>
-      <size_hpa2>0x0</size_hpa2>
+      <hpa_region>
+        <start_hpa>0x100000000</start_hpa>
+        <size_hpa>1024</size_hpa>
+      </hpa_region>
     </memory>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
@@ -135,9 +135,6 @@
       <vcpu_clos>0</vcpu_clos>
       <vcpu_clos>0</vcpu_clos>
     </clos>
-    <memory>
-      <start_hpa>0</start_hpa>
-    </memory>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
@@ -164,7 +161,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>4096</whole>
+      <size>4096</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <pci_devs>
diff --git a/misc/config_tools/data/whl-ipc-i5/partitioned.xml b/misc/config_tools/data/whl-ipc-i5/partitioned.xml
index 9a2c769f1..65c7dba9c 100644
--- a/misc/config_tools/data/whl-ipc-i5/partitioned.xml
+++ b/misc/config_tools/data/whl-ipc-i5/partitioned.xml
@@ -77,10 +77,10 @@
       <size>0</size>
     </epc_section>
     <memory>
-      <start_hpa>0x100000000</start_hpa>
-      <size>0x20000000</size>
-      <start_hpa2>0x0</start_hpa2>
-      <size_hpa2>0x0</size_hpa2>
+      <hpa_region>
+        <start_hpa>0x100000000</start_hpa>
+        <size_hpa>512</size_hpa>
+      </hpa_region>
     </memory>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
@@ -121,10 +121,10 @@
       <size>0</size>
     </epc_section>
     <memory>
-      <start_hpa>0x120000000</start_hpa>
-      <size>0x20000000</size>
-      <start_hpa2>0x0</start_hpa2>
-      <size_hpa2>0x0</size_hpa2>
+      <hpa_region>
+        <start_hpa>0x120000000</start_hpa>
+        <size_hpa>512</size_hpa>
+      </hpa_region>
     </memory>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml
index c6e011776..edbd68208 100644
--- a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml
+++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml
@@ -63,10 +63,6 @@
     <clos>
       <vcpu_clos>0</vcpu_clos>
     </clos>
-    <memory>
-      <start_hpa>0</start_hpa>
-      <size>0x20000000</size>
-    </memory>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
@@ -114,7 +110,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>1024</whole>
+      <size>1024</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <PTM>n</PTM>
diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml
index 6a4cb1145..4194651f4 100644
--- a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml
+++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml
@@ -63,10 +63,6 @@
     <clos>
       <vcpu_clos>0</vcpu_clos>
     </clos>
-    <memory>
-      <start_hpa>0</start_hpa>
-      <size>0x20000000</size>
-    </memory>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
@@ -96,7 +92,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>2048</whole>
+      <size>2048</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <PTM>n</PTM>
diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml
index 42c2196c2..ae26a51db 100644
--- a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml
+++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml
@@ -63,10 +63,6 @@
     <clos>
       <vcpu_clos>0</vcpu_clos>
     </clos>
-    <memory>
-      <start_hpa>0</start_hpa>
-      <size>0x20000000</size>
-    </memory>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
@@ -93,7 +89,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>4096</whole>
+      <size>4096</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <pci_devs>
diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml
index 683c93b1b..a1502170d 100644
--- a/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml
+++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml
@@ -63,10 +63,6 @@
     <clos>
       <vcpu_clos>0</vcpu_clos>
     </clos>
-    <memory>
-      <start_hpa>0</start_hpa>
-      <size>0x20000000</size>
-    </memory>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
@@ -93,7 +89,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>4096</whole>
+      <size>4096</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <pci_devs>
@@ -135,7 +131,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>1024</whole>
+      <size>1024</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <PTM>n</PTM>
diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml
index 80ca0ecb4..c7f9d7d7c 100644
--- a/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml
+++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml
@@ -63,10 +63,6 @@
     <clos>
       <vcpu_clos>0</vcpu_clos>
     </clos>
-    <memory>
-      <start_hpa>0</start_hpa>
-      <size>0x20000000</size>
-    </memory>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
@@ -93,7 +89,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>4096</whole>
+      <size>4096</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <pci_devs>
@@ -135,7 +131,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>1024</whole>
+      <size>1024</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <PTM>n</PTM>
@@ -173,7 +169,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>512</whole>
+      <size>512</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <PTM>n</PTM>
@@ -205,7 +201,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>512</whole>
+      <size>512</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <PTM>n</PTM>
@@ -237,7 +233,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>512</whole>
+      <size>512</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <PTM>n</PTM>
@@ -269,7 +265,7 @@
       <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
-      <whole>512</whole>
+      <size>512</size>
     </memory>
     <console_vuart>COM Port 1</console_vuart>
     <PTM>n</PTM>