From 233f2deb4bb82aa2c7e6aa6b814e11fe23f6d69f Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Thu, 23 Apr 2020 11:16:01 +0800 Subject: [PATCH] acrn-config: add cpu_affinity for launch config xmls 1.Remove cpu_sharing item from launch config xml. 2.Add cpu_affinity for launch config xmls to configurable POST VM cpu affinity from webUI. Tracked-On: #4641 Signed-off-by: Wei Liu Acked-by: Victor Sun Acked-by: Terry Zou --- .../xmls/config-xmls/apl-mrb/sdc_launch_1uos_aaag.xml | 4 +++- .../xmls/config-xmls/apl-mrb/sdc_launch_1uos_aliaag.xml | 4 +++- .../xmls/config-xmls/apl-mrb/sdc_launch_1uos_laag.xml | 4 +++- .../config-xmls/apl-up2-n3350/sdc_launch_1uos_laag.xml | 4 +++- .../xmls/config-xmls/apl-up2/sdc_launch_1uos_aaag.xml | 4 +++- .../xmls/config-xmls/apl-up2/sdc_launch_1uos_laag.xml | 4 +++- .../xmls/config-xmls/generic/hybrid_launch_1uos.xml | 4 +++- .../xmls/config-xmls/generic/industry_launch_1uos.xml | 4 +++- .../xmls/config-xmls/generic/industry_launch_2uos.xml | 8 ++++++-- .../xmls/config-xmls/generic/sdc_launch_1uos.xml | 4 +++- .../config-xmls/nuc6cayh/industry_launch_1uos_hardrt.xml | 4 +++- .../config-xmls/nuc6cayh/industry_launch_1uos_vxworks.xml | 4 +++- .../config-xmls/nuc6cayh/industry_launch_1uos_waag.xml | 4 +++- .../xmls/config-xmls/nuc6cayh/industry_launch_2uos.xml | 8 ++++++-- .../xmls/config-xmls/nuc6cayh/sdc_launch_1uos_laag.xml | 4 +++- .../xmls/config-xmls/nuc6cayh/sdc_launch_1uos_zephyr.xml | 4 +++- .../config-xmls/nuc7i7dnb/industry_launch_1uos_hardrt.xml | 4 +++- .../nuc7i7dnb/industry_launch_1uos_vxworks.xml | 4 +++- .../config-xmls/nuc7i7dnb/industry_launch_1uos_waag.xml | 4 +++- .../xmls/config-xmls/nuc7i7dnb/industry_launch_2uos.xml | 8 ++++++-- .../xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_laag.xml | 4 +++- .../xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_zephyr.xml | 4 +++- .../xmls/config-xmls/template/LAUNCH_POST_RT_VM.xml | 4 +++- .../xmls/config-xmls/template/LAUNCH_POST_STD_VM.xml | 4 +++- .../xmls/config-xmls/tgl-rvp/industry_launch_1uos.xml | 5 ++++- .../whl-ipc-i5/industry_launch_1uos_hardrt.xml | 4 +++- .../whl-ipc-i5/industry_launch_1uos_vxworks.xml | 4 +++- .../config-xmls/whl-ipc-i5/industry_launch_1uos_waag.xml | 4 +++- .../xmls/config-xmls/whl-ipc-i5/industry_launch_2uos.xml | 8 ++++++-- .../xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_laag.xml | 4 +++- .../config-xmls/whl-ipc-i5/sdc_launch_1uos_zephyr.xml | 4 +++- .../whl-ipc-i7/industry_launch_1uos_hardrt.xml | 4 +++- .../whl-ipc-i7/industry_launch_1uos_vxworks.xml | 4 +++- .../config-xmls/whl-ipc-i7/industry_launch_1uos_waag.xml | 4 +++- .../xmls/config-xmls/whl-ipc-i7/industry_launch_2uos.xml | 8 ++++++-- .../xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_laag.xml | 4 +++- .../config-xmls/whl-ipc-i7/sdc_launch_1uos_zephyr.xml | 4 +++- 37 files changed, 127 insertions(+), 42 deletions(-) diff --git a/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aaag.xml b/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aaag.xml index ab60f0d7f..80e20162b 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aaag.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aaag.xml @@ -6,9 +6,11 @@ 64 448 8 ovmf Disable - Disabled IOC + + + 00:15.1 USB controller: Intel Corporation Device 5aaa (rev 0b) diff --git a/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aliaag.xml b/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aliaag.xml index 38a1fcd4e..a40aebe22 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aliaag.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aliaag.xml @@ -6,9 +6,11 @@ 64 448 8 ovmf Disable - Disabled IOC + + + 00:15.1 USB controller: Intel Corporation Device 5aaa (rev 0b) diff --git a/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_laag.xml b/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_laag.xml index dd9e17e3a..fdbc730b9 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_laag.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-mrb/sdc_launch_1uos_laag.xml @@ -6,9 +6,11 @@ 64 448 8 ovmf Enable - Disabled IOC + + + 00:15.1 USB controller: Intel Corporation Device 5aaa (rev 0b) diff --git a/misc/acrn-config/xmls/config-xmls/apl-up2-n3350/sdc_launch_1uos_laag.xml b/misc/acrn-config/xmls/config-xmls/apl-up2-n3350/sdc_launch_1uos_laag.xml index 444a40b96..8dc454b4d 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-up2-n3350/sdc_launch_1uos_laag.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-up2-n3350/sdc_launch_1uos_laag.xml @@ -6,9 +6,11 @@ 64 448 8 ovmf Enable - Disabled PowerButton + + + 00:15.1 USB controller: Intel Corporation Device 5aaa (rev 0b) diff --git a/misc/acrn-config/xmls/config-xmls/apl-up2/sdc_launch_1uos_aaag.xml b/misc/acrn-config/xmls/config-xmls/apl-up2/sdc_launch_1uos_aaag.xml index 04efc5b8f..54914ecdb 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-up2/sdc_launch_1uos_aaag.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-up2/sdc_launch_1uos_aaag.xml @@ -6,9 +6,11 @@ 64 448 8 ovmf Disable - Disabled PowerButton + + + 00:15.1 USB controller: Intel Corporation Device 5aaa (rev 0b) diff --git a/misc/acrn-config/xmls/config-xmls/apl-up2/sdc_launch_1uos_laag.xml b/misc/acrn-config/xmls/config-xmls/apl-up2/sdc_launch_1uos_laag.xml index 393d84120..d95dae933 100644 --- a/misc/acrn-config/xmls/config-xmls/apl-up2/sdc_launch_1uos_laag.xml +++ b/misc/acrn-config/xmls/config-xmls/apl-up2/sdc_launch_1uos_laag.xml @@ -6,9 +6,11 @@ 64 448 8 ovmf Enable - Disabled PowerButton + + + 00:15.1 USB controller: Intel Corporation Device 5aaa (rev 0b) diff --git a/misc/acrn-config/xmls/config-xmls/generic/hybrid_launch_1uos.xml b/misc/acrn-config/xmls/config-xmls/generic/hybrid_launch_1uos.xml index 0da82b006..7de1dc035 100644 --- a/misc/acrn-config/xmls/config-xmls/generic/hybrid_launch_1uos.xml +++ b/misc/acrn-config/xmls/config-xmls/generic/hybrid_launch_1uos.xml @@ -6,9 +6,11 @@ ovmf Disable - Disabled + + + diff --git a/misc/acrn-config/xmls/config-xmls/generic/industry_launch_1uos.xml b/misc/acrn-config/xmls/config-xmls/generic/industry_launch_1uos.xml index 8d0e926b0..652358341 100644 --- a/misc/acrn-config/xmls/config-xmls/generic/industry_launch_1uos.xml +++ b/misc/acrn-config/xmls/config-xmls/generic/industry_launch_1uos.xml @@ -6,9 +6,11 @@ ovmf Disable - Disabled + + + diff --git a/misc/acrn-config/xmls/config-xmls/generic/industry_launch_2uos.xml b/misc/acrn-config/xmls/config-xmls/generic/industry_launch_2uos.xml index 1770f6c23..1a05c8924 100644 --- a/misc/acrn-config/xmls/config-xmls/generic/industry_launch_2uos.xml +++ b/misc/acrn-config/xmls/config-xmls/generic/industry_launch_2uos.xml @@ -6,9 +6,11 @@ ovmf Enable - Disabled + + + @@ -39,9 +41,11 @@ ovmf Disable - Disabled + + + diff --git a/misc/acrn-config/xmls/config-xmls/generic/sdc_launch_1uos.xml b/misc/acrn-config/xmls/config-xmls/generic/sdc_launch_1uos.xml index edf03a5b8..5f7e13d39 100644 --- a/misc/acrn-config/xmls/config-xmls/generic/sdc_launch_1uos.xml +++ b/misc/acrn-config/xmls/config-xmls/generic/sdc_launch_1uos.xml @@ -6,9 +6,11 @@ ovmf Disable - Disabled + + + diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_hardrt.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_hardrt.xml index 4bfd014fc..215001409 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_hardrt.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_hardrt.xml @@ -6,9 +6,11 @@ ovmf Disable - Disabled vuart1(tty) + + + diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_vxworks.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_vxworks.xml index 306b9669e..f6fe615f8 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_vxworks.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_vxworks.xml @@ -6,9 +6,11 @@ ovmf Disable - Disabled + + + diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_waag.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_waag.xml index 92da0fcea..574e07446 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_waag.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_1uos_waag.xml @@ -6,9 +6,11 @@ 64 448 8 ovmf Enable - Disabled + + + diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_2uos.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_2uos.xml index 07c1a6d55..53f3aa8b5 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_2uos.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/industry_launch_2uos.xml @@ -6,9 +6,11 @@ 64 448 8 ovmf Enable - Disabled + + + @@ -40,9 +42,11 @@ ovmf Disable - Disabled vuart1(tty) + + + diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_laag.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_laag.xml index 666b73b5c..2c7552898 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_laag.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_laag.xml @@ -6,9 +6,11 @@ 64 448 8 ovmf Disable - Disabled vuart1(pty) + + + diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_zephyr.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_zephyr.xml index fccaf1f79..e4bd655fe 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_zephyr.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_zephyr.xml @@ -6,9 +6,11 @@ ovmf Enable - Disabled + + + diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_hardrt.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_hardrt.xml index b7c6d3e40..34ea288ad 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_hardrt.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_hardrt.xml @@ -6,9 +6,11 @@ ovmf Disable - Disabled vuart1(tty) + + + diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_vxworks.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_vxworks.xml index a5500a678..2ca9727e1 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_vxworks.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_vxworks.xml @@ -6,9 +6,11 @@ ovmf Disable - Disabled + + + diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_waag.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_waag.xml index 463a9ca17..c5d0e357b 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_waag.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_waag.xml @@ -6,9 +6,11 @@ 64 448 8 ovmf Enable - Disabled + + + diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_2uos.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_2uos.xml index d8e6e31cb..7506f696f 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_2uos.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/industry_launch_2uos.xml @@ -6,9 +6,11 @@ 64 448 8 ovmf Enable - Disabled + + + @@ -40,9 +42,11 @@ ovmf Disable - Disabled vuart1(tty) + + + diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_laag.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_laag.xml index e0a7d58e9..b5c0b565f 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_laag.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_laag.xml @@ -6,9 +6,11 @@ 64 448 8 ovmf Disable - Disabled vuart1(pty) + + + diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_zephyr.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_zephyr.xml index dcef33b4a..86fa801d0 100644 --- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_zephyr.xml +++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_zephyr.xml @@ -6,9 +6,11 @@ ovmf Enable - Disabled + + + diff --git a/misc/acrn-config/xmls/config-xmls/template/LAUNCH_POST_RT_VM.xml b/misc/acrn-config/xmls/config-xmls/template/LAUNCH_POST_RT_VM.xml index ce0ee99fa..35f6543a5 100644 --- a/misc/acrn-config/xmls/config-xmls/template/LAUNCH_POST_RT_VM.xml +++ b/misc/acrn-config/xmls/config-xmls/template/LAUNCH_POST_RT_VM.xml @@ -6,9 +6,11 @@ ovmf - + + + diff --git a/misc/acrn-config/xmls/config-xmls/template/LAUNCH_POST_STD_VM.xml b/misc/acrn-config/xmls/config-xmls/template/LAUNCH_POST_STD_VM.xml index 3959d01bc..cddb7038f 100644 --- a/misc/acrn-config/xmls/config-xmls/template/LAUNCH_POST_STD_VM.xml +++ b/misc/acrn-config/xmls/config-xmls/template/LAUNCH_POST_STD_VM.xml @@ -6,9 +6,11 @@ gvtd ovmf - + + + diff --git a/misc/acrn-config/xmls/config-xmls/tgl-rvp/industry_launch_1uos.xml b/misc/acrn-config/xmls/config-xmls/tgl-rvp/industry_launch_1uos.xml index e364812ac..1ade55829 100644 --- a/misc/acrn-config/xmls/config-xmls/tgl-rvp/industry_launch_1uos.xml +++ b/misc/acrn-config/xmls/config-xmls/tgl-rvp/industry_launch_1uos.xml @@ -6,11 +6,14 @@ 2000 64 448 8 ovmf - Disabled /dev/nvme0n1p3 /root/uos/uos.img com1(ttyS0) + + + +