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>
This commit is contained in:
Chenli Wei
2022-04-20 11:15:48 +08:00
committed by acrnsi-robot
parent 52268f5cc2
commit cf05e37c85
23 changed files with 112 additions and 175 deletions

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>