github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-20 12:42:54 +00:00
Code Issues Projects Releases Wiki Activity

acrn-config: remove configurable="0" for hybrid scenario config

Browse Source 
remove configurable="0" for hybrid scenario pci_devs of Pre Launched VM.

Tracked-On: #4808
Signed-off-by: Wei Liu <weix.w.liu@intel.com>
Acked-by: Victor Sun <victor.sun@intel.com>
This commit is contained in:
Wei Liu 2020-05-18 09:00:15 +08:00 committed by wenlingz
parent 39ab45f06b
commit 3ecaa62510
9 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
misc/acrn-config/library/scenario_cfg_lib.py
View File

@ -37,6 +37,7 @@ PT_SUB_PCI['ethernet'] = ['Ethernet controller', 'Network controller', '802.1a c
'802.1b controller', 'Wireless controller']
PT_SUB_PCI['sata'] = ['SATA controller']
PT_SUB_PCI['nvme'] = ['Non-Volatile memory controller']
PT_SUB_PCI['usb'] = ['USB controller']
UUID_DB = {
'SOS_VM':['dbbbd434-7a57-4216-a12c-2201f1ab0240'],
'SAFETY_VM':['fc836901-8685-4bc0-8b71-6e31dc36fa47'],
@ -574,6 +575,9 @@ def avl_pci_devs():
pci_dev_list.extend(tmp_pci_list)
tmp_pci_list = common.get_avl_dev_info(bdf_desc_map, PT_SUB_PCI['nvme'])
pci_dev_list.extend(tmp_pci_list)
tmp_pci_list = common.get_avl_dev_info(bdf_desc_map, PT_SUB_PCI['usb'])
pci_dev_list.extend(tmp_pci_list)
pci_dev_list.insert(0, '')
return pci_dev_list

2
misc/acrn-config/xmls/config-xmls/apl-mrb/hybrid.xml
View File

@ -91,7 +91,7 @@
<target_vm_id desc="COM2 is used for VM communications. When it is enabled, please specify which target VM that current VM connect to.">1</target_vm_id>
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
</vuart>
<pci_devs configurable="0" desc="pci devices list">
<pci_devs desc="pci devices list">
<pci_dev desc="pci device"></pci_dev>
</pci_devs>
</vm>

2
misc/acrn-config/xmls/config-xmls/apl-up2/hybrid.xml
View File

@ -91,7 +91,7 @@
<target_vm_id desc="COM2 is used for VM communications. When it is enabled, please specify which target VM that current VM connect to.">1</target_vm_id>
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
</vuart>
<pci_devs configurable="0" desc="pci devices list">
<pci_devs desc="pci devices list">
<pci_dev desc="pci device"></pci_dev>
</pci_devs>
</vm>

2
misc/acrn-config/xmls/config-xmls/ehl-crb-b/hybrid.xml
View File

@ -87,7 +87,7 @@
<target_vm_id desc="COM2 is used for VM communications. When it is enabled, please specify which target VM that current VM connect to.">1</target_vm_id>
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
</vuart>
<pci_devs configurable="0" desc="pci devices list">
<pci_devs desc="pci devices list">
<pci_dev desc="pci device" />
</pci_devs>
</vm>

2
misc/acrn-config/xmls/config-xmls/generic/hybrid.xml
View File

@ -91,7 +91,7 @@
<target_vm_id desc="COM2 is used for VM communications. When it is enabled, please specify which target VM that current VM connect to.">1</target_vm_id>
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
</vuart>
<pci_devs configurable="0" desc="pci devices list">
<pci_devs desc="pci devices list">
<pci_dev desc="pci device"></pci_dev>
</pci_devs>
</vm>

2
misc/acrn-config/xmls/config-xmls/nuc6cayh/hybrid.xml
View File

@ -91,7 +91,7 @@
<target_vm_id desc="COM2 is used for VM communications. When it is enabled, please specify which target VM that current VM connect to.">1</target_vm_id>
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
</vuart>
<pci_devs configurable="0" desc="pci devices list">
<pci_devs desc="pci devices list">
<pci_dev desc="pci device"></pci_dev>
</pci_devs>
</vm>

2
misc/acrn-config/xmls/config-xmls/nuc7i7dnb/hybrid.xml
View File

@ -91,7 +91,7 @@
<target_vm_id desc="COM2 is used for VM communications. When it is enabled, please specify which target VM that current VM connect to.">1</target_vm_id>
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
</vuart>
<pci_devs configurable="0" desc="pci devices list">
<pci_devs desc="pci devices list">
<pci_dev desc="pci device"></pci_dev>
</pci_devs>
</vm>

2
misc/acrn-config/xmls/config-xmls/whl-ipc-i5/hybrid.xml
View File

@ -91,7 +91,7 @@
<target_vm_id desc="COM2 is used for VM communications. When it is enabled, please specify which target VM that current VM connect to.">1</target_vm_id>
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
</vuart>
<pci_devs configurable="0" desc="pci devices list">
<pci_devs desc="pci devices list">
<pci_dev desc="pci device"></pci_dev>
</pci_devs>
</vm>

2
misc/acrn-config/xmls/config-xmls/whl-ipc-i7/hybrid.xml
View File

@ -91,7 +91,7 @@
<target_vm_id desc="COM2 is used for VM communications. When it is enabled, please specify which target VM that current VM connect to.">1</target_vm_id>
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
</vuart>
<pci_devs configurable="0" desc="pci devices list">
<pci_devs desc="pci devices list">
<pci_dev desc="pci device"></pci_dev>
</pci_devs>
</vm>