Skip to content

Commit 1195982

Browse files
Wei Liuwenlingz
authored andcommitted
acrn-config: refinement for pci_devs in scenario config xmls
remove configurable="0" for pci_devs of pre-launched VM so that the passthru devices could be configurable on webUI. 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 fb5c35d commit 1195982

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

misc/acrn-config/xmls/config-xmls/apl-mrb/logical_partition.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<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>
9595
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
9696
</vuart>
97-
<pci_devs configurable="0" desc="pci devices list">
97+
<pci_devs desc="pci devices list">
9898
<pci_dev desc="pci device">00:12.0 SATA controller: Intel Corporation Celeron N3350/Pentium N4200/Atom E3900 Series SATA AHCI Controller (rev 0b)</pci_dev>
9999
<pci_dev desc="pci device">02:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03)</pci_dev>
100100
</pci_devs>
@@ -146,7 +146,7 @@
146146
<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>
147147
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
148148
</vuart>
149-
<pci_devs configurable="0" desc="pci devices list">
149+
<pci_devs desc="pci devices list">
150150
<pci_dev desc="pci device">00:15.0 USB controller: Intel Corporation Celeron N3350/Pentium N4200/Atom E3900 Series USB xHCI (rev 0b)</pci_dev>
151151
<pci_dev desc="pci device">03:00.0 Ethernet controller: Marvell Technology Group Ltd. 88W8897 [AVASTAR] 802.11ac Wireless</pci_dev>
152152
</pci_devs>

misc/acrn-config/xmls/config-xmls/apl-up2-n3350/logical_partition.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<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>
9595
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
9696
</vuart>
97-
<pci_devs configurable="0" desc="pci devices list">
97+
<pci_devs desc="pci devices list">
9898
<pci_dev desc="pci device">00:12.0 SATA controller: Intel Corporation Celeron N3350/Pentium N4200/Atom E3900 Series SATA AHCI Controller (rev 0b)</pci_dev>
9999
<pci_dev desc="pci device">02:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller (rev 0c)</pci_dev>
100100
</pci_devs>
@@ -145,7 +145,7 @@
145145
<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>
146146
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
147147
</vuart>
148-
<pci_devs configurable="0" desc="pci devices list">
148+
<pci_devs desc="pci devices list">
149149
<pci_dev desc="pci device">00:15.0 USB controller: Intel Corporation Celeron N3350/Pentium N4200/Atom E3900 Series USB xHCI (rev 0b)</pci_dev>
150150
<pci_dev desc="pci device">03:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller (rev 0c)</pci_dev>
151151
</pci_devs>

misc/acrn-config/xmls/config-xmls/apl-up2/logical_partition.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<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>
9696
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
9797
</vuart>
98-
<pci_devs configurable="0" desc="pci devices list">
98+
<pci_devs desc="pci devices list">
9999
<pci_dev desc="pci device">00:12.0 SATA controller: Intel Corporation Celeron N3350/Pentium N4200/Atom E3900 Series SATA AHCI Controller (rev 0b)</pci_dev>
100100
<pci_dev desc="pci device">02:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller (rev 0c)</pci_dev>
101101
</pci_devs>
@@ -147,7 +147,7 @@
147147
<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>
148148
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
149149
</vuart>
150-
<pci_devs configurable="0" desc="pci devices list">
150+
<pci_devs desc="pci devices list">
151151
<pci_dev desc="pci device">00:15.0 USB controller: Intel Corporation Celeron N3350/Pentium N4200/Atom E3900 Series USB xHCI (rev 0b)</pci_dev>
152152
<pci_dev desc="pci device">03:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller (rev 0c)</pci_dev>
153153
</pci_devs>

misc/acrn-config/xmls/config-xmls/generic/logical_partition.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
<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>
9797
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
9898
</vuart>
99-
<pci_devs configurable="0" desc="pci devices list">
99+
<pci_devs desc="pci devices list">
100100
<pci_dev desc="pci device"></pci_dev>
101101
<pci_dev desc="pci device"></pci_dev>
102102
</pci_devs>
@@ -149,7 +149,7 @@
149149
<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>
150150
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
151151
</vuart>
152-
<pci_devs configurable="0" desc="pci devices list">
152+
<pci_devs desc="pci devices list">
153153
<pci_dev desc="pci device"></pci_dev>
154154
<pci_dev desc="pci device"></pci_dev>
155155
</pci_devs>

misc/acrn-config/xmls/config-xmls/nuc6cayh/logical_partition.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<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>
9696
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
9797
</vuart>
98-
<pci_devs configurable="0" desc="pci devices list">
98+
<pci_devs desc="pci devices list">
9999
<pci_dev desc="pci device">00:12.0 SATA controller: Intel Corporation Celeron N3350/Pentium N4200/Atom E3900 Series SATA AHCI Controller (rev 0b)</pci_dev>
100100
<pci_dev desc="pci device">03:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller (rev 15)</pci_dev>
101101
</pci_devs>
@@ -147,7 +147,7 @@
147147
<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>
148148
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
149149
</vuart>
150-
<pci_devs configurable="0" desc="pci devices list">
150+
<pci_devs desc="pci devices list">
151151
<pci_dev desc="pci device">00:15.0 USB controller: Intel Corporation Celeron N3350/Pentium N4200/Atom E3900 Series USB xHCI (rev 0b)</pci_dev>
152152
<pci_dev desc="pci device">02:00.0 Network controller: Intel Corporation Device 24fb (rev 10)</pci_dev>
153153
</pci_devs>

misc/acrn-config/xmls/config-xmls/nuc7i7dnb/logical_partition.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
9797
</vuart>
9898
<pci_dev_num configurable="0" desc="pci devices number">VM0_CONFIG_PCI_DEV_NUM</pci_dev_num>
99-
<pci_devs configurable="0" desc="pci devices list">
99+
<pci_devs desc="pci devices list">
100100
<pci_dev desc="pci device">00:17.0 SATA controller: Intel Corporation Sunrise Point-LP SATA Controller [AHCI mode] (rev 21)</pci_dev>
101101
<pci_dev desc="pci device">00:1f.6 Ethernet controller: Intel Corporation Ethernet Connection I219-LM (rev 21)</pci_dev>
102102
</pci_devs>
@@ -149,7 +149,7 @@
149149
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
150150
</vuart>
151151
<pci_dev_num configurable="0" desc="pci devices number">VM1_CONFIG_PCI_DEV_NUM</pci_dev_num>
152-
<pci_devs configurable="0" desc="pci devices list">
152+
<pci_devs desc="pci devices list">
153153
<pci_dev desc="pci device">00:14.0 USB controller: Intel Corporation Sunrise Point-LP USB 3.0 xHCI Controller (rev 21)</pci_dev>
154154
<pci_dev desc="pci device">01:00.0 Network controller: Intel Corporation Wireless 8265 / 8275 (rev 78)</pci_dev>
155155
</pci_devs>

misc/acrn-config/xmls/config-xmls/whl-ipc-i5/logical_partition.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<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>
9696
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
9797
</vuart>
98-
<pci_devs configurable="0" desc="pci devices list">
98+
<pci_devs desc="pci devices list">
9999
<pci_dev desc="pci device">00:17.0 SATA controller: Intel Corporation Device 9dd3 (rev 30)</pci_dev>
100100
<pci_dev desc="pci device">03:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03)</pci_dev>
101101
</pci_devs>
@@ -147,7 +147,7 @@
147147
<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>
148148
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
149149
</vuart>
150-
<pci_devs configurable="0" desc="pci devices list">
150+
<pci_devs desc="pci devices list">
151151
<pci_dev desc="pci device">00:14.0 USB controller: Intel Corporation Device 9ded (rev 30)</pci_dev>
152152
<pci_dev desc="pci device">04:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03)</pci_dev>
153153
</pci_devs>

misc/acrn-config/xmls/config-xmls/whl-ipc-i7/logical_partition.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<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>
9696
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
9797
</vuart>
98-
<pci_devs configurable="0" desc="pci devices list">
98+
<pci_devs desc="pci devices list">
9999
<pci_dev desc="pci device">00:17.0 SATA controller: Intel Corporation Device 9dd3 (rev 30)</pci_dev>
100100
<pci_dev desc="pci device">03:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03)</pci_dev>
101101
</pci_devs>
@@ -147,7 +147,7 @@
147147
<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>
148148
<target_uart_id configurable="0" desc="target vUART ID that vCOM2 connect to">1</target_uart_id>
149149
</vuart>
150-
<pci_devs configurable="0" desc="pci devices list">
150+
<pci_devs desc="pci devices list">
151151
<pci_dev desc="pci device">00:14.0 USB controller: Intel Corporation Device 9ded (rev 30)</pci_dev>
152152
<pci_dev desc="pci device">04:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03)</pci_dev>
153153
</pci_devs>

0 commit comments

Comments
 (0)