diff --git a/misc/config_tools/config_app/views.py b/misc/config_tools/config_app/views.py
index 5ac155e84..707c51586 100644
--- a/misc/config_tools/config_app/views.py
+++ b/misc/config_tools/config_app/views.py
@@ -973,7 +973,7 @@ def get_generic_scenario_config(scenario_config, add_vm_type=None):
'SOS_VM': ('industry', 'vm:id=0'),
'POST_STD_VM': ('industry', 'vm:id=1'),
'POST_RT_VM': ('industry', 'vm:id=2'),
- 'KATA_VM': ('industry', 'vm:id=1'),
+ 'KATA_VM': ('industry', 'vm:id=7'),
'LAUNCH_POST_STD_VM': ('industry_launch_2uos', 'uos:id=1'),
'LAUNCH_POST_RT_VM': ('industry_launch_2uos', 'uos:id=2')
}
@@ -1219,4 +1219,4 @@ def utility_functions():
def print_in_console(message):
print(str(message))
- return dict(mdebug=print_in_console)
\ No newline at end of file
+ return dict(mdebug=print_in_console)
diff --git a/misc/config_tools/data/tgl-rvp/industry.xml b/misc/config_tools/data/tgl-rvp/industry.xml
index 49ee0cbed..a938a8a8f 100644
--- a/misc/config_tools/data/tgl-rvp/industry.xml
+++ b/misc/config_tools/data/tgl-rvp/industry.xml
@@ -1,39 +1,36 @@
-
- n
- /dev/ttyS0
- 5
- 5
- 3
- 7
- 0x40000
+ n
+ /dev/ttyS0
+ 5
+ 5
+ 3
+ 7
+ 0x40000
-
- y
- SCHED_BVT
- y
- y
-
- n
- n
-
- y
- n
- y
- n
- n
-
- n
-
-
-
- n
-
+ y
+ SCHED_BVT
+ y
+ y
+
+ n
+ n
+
+ y
+ n
+ y
+ n
+ n
+
+ n
+
+
+
+ n
+
-
0x2000
@@ -41,186 +38,330 @@
0x00010000
0x480000000
-
- 0x100
- 256
- 1
- 96
- 120
- 64
- 64
- 16
+ 0x100
+ 256
+ 1
+ 96
+ 120
+ 64
+ 64
+ 16
-
- 0x00000010
+ 0x00000010
-
SOS_VM
ACRN SOS VM
-
+
- 0
+ 0
- 0
- 0x20000000
+ 0
+ 0x20000000
- ACRN Service OS
- KERNEL_BZIMAGE
- Linux_bzImage
-
- SOS_VM_BOOTARGS
+ ACRN Service OS
+ KERNEL_BZIMAGE
+ Linux_bzImage
+
+ SOS_VM_BOOTARGS
- VUART_LEGACY_PIO
- SOS_COM1_BASE
- SOS_COM1_IRQ
+ VUART_LEGACY_PIO
+ SOS_COM1_BASE
+ SOS_COM1_IRQ
- VUART_LEGACY_PIO
- SOS_COM2_BASE
- SOS_COM2_IRQ
- 2
- 1
+ VUART_LEGACY_PIO
+ SOS_COM2_BASE
+ SOS_COM2_IRQ
+ 2
+ 1
- INVALID_PCI_BASE
+ INVALID_PCI_BASE
- INVALID_PCI_BASE
- 1
- 1
+ INVALID_PCI_BASE
+ 1
+ 1
-
+
- /dev/nvme0n1p3
- rw rootwait console=ttyS0 consoleblank=0 no_timer_check quiet loglevel=3 i915.nuclear_pageflip=1
+ /dev/nvme0n1p3
+ rw rootwait console=ttyS0 consoleblank=0 no_timer_check quiet loglevel=3 i915.nuclear_pageflip=1
POST_STD_VM
-
+
- 0
- 1
+ 0
+ 1
- 0
- 0
+ 0
+ 0
- 0
- 0
+ 0
+ 0
-
- VUART_LEGACY_PIO
- COM1_BASE
- COM1_IRQ
+ VUART_LEGACY_PIO
+ COM1_BASE
+ COM1_IRQ
- VUART_LEGACY_PIO
- INVALID_COM_BASE
- COM2_IRQ
- 0
- 1
+ VUART_LEGACY_PIO
+ INVALID_COM_BASE
+ COM2_IRQ
+ 0
+ 1
- INVALID_PCI_BASE
+ INVALID_PCI_BASE
- INVALID_PCI_BASE
- 1
- 1
+ INVALID_PCI_BASE
+ 1
+ 1
POST_RT_VM
- 0
+
- 2
- 3
+ 2
+ 3
- 0
- 0
+ 0
+ 0
- 0
- 0
+ 0
+ 0
- VUART_LEGACY_PIO
- COM1_BASE
- COM1_IRQ
+ VUART_LEGACY_PIO
+ COM1_BASE
+ COM1_IRQ
- VUART_LEGACY_PIO
- COM2_BASE
- COM2_IRQ
- 0
- 1
+ VUART_LEGACY_PIO
+ COM2_BASE
+ COM2_IRQ
+ 0
+ 1
- INVALID_PCI_BASE
+ INVALID_PCI_BASE
- INVALID_PCI_BASE
- 1
- 1
+ INVALID_PCI_BASE
+ 1
+ 1
POST_STD_VM
- 0
+
- 0
- 1
+ 0
+ 1
- 0
- 0
+ 0
+ 0
- 0
- 0
+ 0
+ 0
- VUART_LEGACY_PIO
- COM1_BASE
- COM1_IRQ
+ VUART_LEGACY_PIO
+ COM1_BASE
+ COM1_IRQ
- VUART_LEGACY_PIO
- INVALID_COM_BASE
- COM2_IRQ
- 0
- 1
+ VUART_LEGACY_PIO
+ INVALID_COM_BASE
+ COM2_IRQ
+ 0
+ 1
- INVALID_PCI_BASE
+ INVALID_PCI_BASE
- INVALID_PCI_BASE
- 1
- 1
+ INVALID_PCI_BASE
+ 1
+ 1
+
+
+
+ POST_STD_VM
+
+
+
+
+ 0
+ 1
+
+
+ 0
+ 0
+
+
+ 0
+ 0
+
+
+ VUART_LEGACY_PIO
+ COM1_BASE
+ COM1_IRQ
+
+
+ VUART_LEGACY_PIO
+ INVALID_COM_BASE
+ COM2_IRQ
+ 0
+ 1
+
+
+ INVALID_PCI_BASE
+
+
+ INVALID_PCI_BASE
+ 1
+ 1
+
+
+
+ POST_STD_VM
+
+
+
+
+ 0
+ 1
+
+
+ 0
+ 0
+
+
+ 0
+ 0
+
+
+ VUART_LEGACY_PIO
+ COM1_BASE
+ COM1_IRQ
+
+
+ VUART_LEGACY_PIO
+ INVALID_COM_BASE
+ COM2_IRQ
+ 0
+ 1
+
+
+ INVALID_PCI_BASE
+
+
+ INVALID_PCI_BASE
+ 1
+ 1
+
+
+
+ POST_STD_VM
+
+
+
+
+ 0
+ 1
+
+
+ 0
+ 0
+
+
+ 0
+ 0
+
+
+ VUART_LEGACY_PIO
+ COM1_BASE
+ COM1_IRQ
+
+
+ VUART_LEGACY_PIO
+ INVALID_COM_BASE
+ COM2_IRQ
+ 0
+ 1
+
+
+ INVALID_PCI_BASE
+
+
+ INVALID_PCI_BASE
+ 1
+ 1
+
+
+
+ KATA_VM
+
+ 0
+ 1
+
+
+ 0
+ 0
+
+
+ 0
+ 0
+
+
+ VUART_LEGACY_PIO
+ INVALID_COM_BASE
+ COM1_IRQ
+
+
+ VUART_LEGACY_PIO
+ INVALID_COM_BASE
+ COM2_IRQ
+ 0
+ 0
+
+
+ INVALID_PCI_BASE
+
+
+ INVALID_PCI_BASE
+ 1
+ 1
-
diff --git a/misc/config_tools/data/tgl-rvp/industry_launch_6uos.xml b/misc/config_tools/data/tgl-rvp/industry_launch_6uos.xml
new file mode 100644
index 000000000..a864245da
--- /dev/null
+++ b/misc/config_tools/data/tgl-rvp/industry_launch_6uos.xml
@@ -0,0 +1,245 @@
+
+
+ WINDOWS
+ no
+ 4096
+ gvtd
+ ovmf
+ Enable
+
+
+
+
+
+
+
+
+ Disable
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ WaaG
+
+ ./win10-ltsc.img
+
+
+
+
+
+ PREEMPT-RT LINUX
+ Hard RT
+ 1024
+
+ ovmf
+ Disable
+
+
+
+
+
+
+
+
+ Disable
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @stdio:stdio_port
+
+
+
+ YOCTO
+ no
+ 512
+
+ ovmf
+ Disable
+
+
+
+
+
+
+
+
+ Disable
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ YOCTO
+ no
+ 512
+
+ ovmf
+ Disable
+
+
+
+
+
+
+
+
+ Disable
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ YOCTO
+ no
+ 512
+
+ ovmf
+ Disable
+
+
+
+
+
+
+
+
+ Disable
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ YOCTO
+ no
+ 512
+
+ ovmf
+ Disable
+
+
+
+
+
+
+
+
+ Disable
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+