Skip to content

Commit 1d4b7ab

Browse files
Wei Liuwenlingz
authored andcommitted
acrn-config: refine template xmls
Refine some items for configuarable="0" Tracked-On: #4641 Signed-off-by: Wei Liu <weix.w.liu@intel.com> Acked-by: Victor Sun <victor.sun@intel.com> Acked-by: Terry Zou <terry.zou@intel.com>
1 parent ea0c62d commit 1d4b7ab

File tree

6 files changed

+22
-22
lines changed

6 files changed

+22
-22
lines changed

misc/acrn-config/xmls/config-xmls/template/KATA_VM.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@
88
<pcpu_id></pcpu_id>
99
</vcpu_affinity>
1010
<epc_section configurable="0" desc="epc section">
11-
<base desc="SGX EPC section base, must be page aligned"></base>
12-
<size desc="SGX EPC section size in Bytes, must be page aligned"></size>
11+
<base desc="SGX EPC section base, must be page aligned">0</base>
12+
<size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
1313
</epc_section>
1414
<vuart id="0">
1515
<type configurable="0" desc="vCOM1 type">VUART_LEGACY_PIO</type>
1616
<base configurable="0" desc="vUART0 (A.K.A COM1) enabling switch. Enable by exposing its base address, disable by returning invalid base address.">INVALID_COM_BASE</base>
17-
<irq configurable="0" desc="vCOM1 irq">COM1_BASE</irq>
17+
<irq configurable="0" desc="vCOM1 irq">COM1_IRQ</irq>
1818
</vuart>
1919
<vuart id="1">
2020
<type configurable="0" desc="vCOM2 type">VUART_LEGACY_PIO</type>
21-
<base configurable="0" desc="vUART1 (A.K.A COM2) enabling switch. Enable by exposing its base address, disable by returning invalid base address.">INVALID_COM_BASE</base>
22-
<irq configurable="0" desc="vCOM2 irq">COM2_BASE</irq>
23-
<target_vm_id desc="COM2 is used for VM communications. When it is enabled, please specify which target VM that current VM connect to."></target_vm_id>
24-
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">0</target_uart_id>
21+
<base desc="vUART1 (A.K.A COM2) enabling switch. Enable by exposing its base address, disable by returning invalid base address.">INVALID_COM_BASE</base>
22+
<irq configurable="0" desc="vCOM2 irq">COM2_IRQ</irq>
23+
<target_vm_id desc="COM2 is used for VM communications. When it is enabled, please specify which target VM that current VM connect to.">0</target_vm_id>
24+
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
2525
</vuart>
2626
</vm>
2727
</acrn-config>

misc/acrn-config/xmls/config-xmls/template/POST_RT_VM.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@
1111
<vcpu_clos>0</vcpu_clos>
1212
</clos>
1313
<epc_section configurable="0" desc="epc section">
14-
<base desc="SGX EPC section base, must be page aligned"></base>
15-
<size desc="SGX EPC section size in Bytes, must be page aligned"></size>
14+
<base desc="SGX EPC section base, must be page aligned">0</base>
15+
<size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
1616
</epc_section>
1717
<vuart id="0">
1818
<type configurable="0" desc="vCOM1 type">VUART_LEGACY_PIO</type>
19-
<base desc="vUART0 (A.K.A COM1) enabling switch. Enable by exposing its base address, disable by returning invalid base address.">INVALID_COM_BASE</base>
19+
<base desc="vUART0 (A.K.A COM1) enabling switch. Enable by exposing its base address, disable by returning invalid base address.">COM1_BASE</base>
2020
<irq configurable="0" desc="vCOM1 irq">COM1_IRQ</irq>
2121
</vuart>
2222
<vuart id="1">
2323
<type configurable="0" desc="vCOM2 type">VUART_LEGACY_PIO</type>
2424
<base desc="vUART1 (A.K.A COM2) enabling switch. Enable by exposing its base address, disable by returning invalid base address.">INVALID_COM_BASE</base>
2525
<irq configurable="0" desc="vCOM2 irq">COM2_IRQ</irq>
26-
<target_vm_id desc="COM2 is used for VM communications. When it is enabled, please specify which target VM that current VM connect to."></target_vm_id>
26+
<target_vm_id desc="COM2 is used for VM communications. When it is enabled, please specify which target VM that current VM connect to.">0</target_vm_id>
2727
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
2828
</vuart>
2929
</vm>

misc/acrn-config/xmls/config-xmls/template/POST_STD_VM.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<vcpu_clos>0</vcpu_clos>
1212
</clos>
1313
<epc_section configurable="0" desc="epc section">
14-
<base desc="SGX EPC section base, must be page aligned"></base>
15-
<size desc="SGX EPC section size in Bytes, must be page aligned"></size>
14+
<base desc="SGX EPC section base, must be page aligned">0</base>
15+
<size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
1616
</epc_section>
1717
<vuart id="0">
1818
<type configurable="0" desc="vCOM1 type">VUART_LEGACY_PIO</type>
@@ -23,7 +23,7 @@
2323
<type configurable="0" desc="vCOM2 type">VUART_LEGACY_PIO</type>
2424
<base desc="vUART1 (A.K.A COM2) enabling switch. Enable by exposing its base address, disable by returning invalid base address.">INVALID_COM_BASE</base>
2525
<irq configurable="0" desc="vCOM2 irq">COM2_IRQ</irq>
26-
<target_vm_id desc="COM2 is used for VM communications. When it is enabled, please specify which target VM that current VM connect to."></target_vm_id>
26+
<target_vm_id desc="COM2 is used for VM communications. When it is enabled, please specify which target VM that current VM connect to.">0</target_vm_id>
2727
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
2828
</vuart>
2929
</vm>

misc/acrn-config/xmls/config-xmls/template/PRE_STD_VM.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<vcpu_clos>0</vcpu_clos>
1313
</clos>
1414
<epc_section configurable="0" desc="epc section">
15-
<base desc="SGX EPC section base, must be page aligned"></base>
16-
<size desc="SGX EPC section size in Bytes, must be page aligned"></size>
15+
<base desc="SGX EPC section base, must be page aligned">0</base>
16+
<size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
1717
</epc_section>
1818
<memory>
1919
<start_hpa desc="The start physical address in host for the VM"></start_hpa>
@@ -38,7 +38,7 @@
3838
<type configurable="0" desc="vCOM2 type">VUART_LEGACY_PIO</type>
3939
<base desc="vUART1 (A.K.A COM2) enabling switch. Enable by exposing its base address, disable by returning invalid base address.">INVALID_COM_BASE</base>
4040
<irq configurable="0" desc="vCOM2 irq">COM2_IRQ</irq>
41-
<target_vm_id desc="COM2 is used for VM communications. When it is enabled, please specify which target VM that current VM connect to."></target_vm_id>
41+
<target_vm_id desc="COM2 is used for VM communications. When it is enabled, please specify which target VM that current VM connect to.">0</target_vm_id>
4242
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
4343
</vuart>
4444
<pci_devs desc="pci devices list">

misc/acrn-config/xmls/config-xmls/template/SAFETY_VM.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<vcpu_clos>0</vcpu_clos>
1313
</clos>
1414
<epc_section configurable="0" desc="epc section">
15-
<base desc="SGX EPC section base, must be page aligned"></base>
16-
<size desc="SGX EPC section size in Bytes, must be page aligned"></size>
15+
<base desc="SGX EPC section base, must be page aligned">0</base>
16+
<size desc="SGX EPC section size in Bytes, must be page aligned">0</size>
1717
</epc_section>
1818
<memory>
1919
<start_hpa desc="The start physical address in host for the VM"></start_hpa>
@@ -39,7 +39,7 @@
3939
<type configurable="0" desc="vCOM2 type">VUART_LEGACY_PIO</type>
4040
<base desc="vUART1 (A.K.A COM2) enabling switch. Enable by exposing its base address, disable by returning invalid base address.">INVALID_COM_BASE</base>
4141
<irq configurable="0" desc="vCOM2 irq">COM2_IRQ</irq>
42-
<target_vm_id desc="COM2 is used for VM communications. When it is enabled, please specify which target VM that current VM connect to."></target_vm_id>
42+
<target_vm_id desc="COM2 is used for VM communications. When it is enabled, please specify which target VM that current VM connect to.">0</target_vm_id>
4343
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
4444
</vuart>
4545
<pci_devs configurable="0" desc="pci devices list">

misc/acrn-config/xmls/config-xmls/template/SOS_VM.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<size configurable="0" desc="The memory size in Bytes for the VM">0x20000000</size>
1414
</memory>
1515
<os_config>
16-
<name desc="Specify the OS name of VM, currently it is not referenced by hypervisor code.">ACRN Service OS</name>
16+
<name desc="Specify the OS name of VM, currently it is not referenced by hypervisor code."></name>
1717
<kern_type desc="Specify the VM name which will be shown in hypervisor console command: vm_list."></kern_type>
1818
<kern_mod desc="The tag for kernel image which act as multiboot module, it must exactly match the module tag in GRUB multiboot cmdline."></kern_mod>
1919
<ramdisk_mod desc="The tag for ramdisk image which act as multiboot module, it must exactly match the module tag in GRUB multiboot cmdline."></ramdisk_mod>
@@ -28,7 +28,7 @@
2828
<type configurable="0" desc="vCOM2 type">VUART_LEGACY_PIO</type>
2929
<base desc="vUART1 (A.K.A COM2) enabling switch. Enable by exposing its base address, disable by returning invalid base address.">INVALID_COM_BASE</base>
3030
<irq configurable="0" desc="vCOM2 irq">SOS_COM2_IRQ</irq>
31-
<target_vm_id desc="COM2 is used for VM communications. When it is enabled, please specify which target VM that current VM connect to."></target_vm_id>
31+
<target_vm_id desc="COM2 is used for VM communications. When it is enabled, please specify which target VM that current VM connect to.">2</target_vm_id>
3232
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
3333
</vuart>
3434
<pci_devs configurable="0" desc="pci devices list">

0 commit comments

Comments
 (0)