From 1ef1ebe4e9bdfcbca1b7aa1041b59879c9a4c344 Mon Sep 17 00:00:00 2001 From: Shuang Zheng Date: Thu, 20 Aug 2020 18:20:46 +0800 Subject: [PATCH] acrn-config: update launch xmls for Inter-VM commnication config add shm_region config in default launch XMLs to configure Inter- VM communication for post-launched VMs. Tracked-On: #4853 Signed-off-by: Shuang Zheng Acked-by: Victor Sun --- .../xmls/config-xmls/apl-mrb/hybrid.xml | 4 ++++ .../xmls/config-xmls/apl-mrb/industry.xml | 4 ++++ .../xmls/config-xmls/apl-mrb/sdc.xml | 4 ++++ .../apl-mrb/sdc_launch_1uos_aaag.xml | 3 +++ .../apl-mrb/sdc_launch_1uos_aliaag.xml | 3 +++ .../apl-mrb/sdc_launch_1uos_laag.xml | 3 +++ .../apl-up2-n3350/logical_partition.xml | 4 ++++ .../apl-up2-n3350/sdc_launch_1uos_laag.xml | 3 +++ .../xmls/config-xmls/apl-up2/hybrid.xml | 4 ++++ .../xmls/config-xmls/apl-up2/industry.xml | 4 ++++ .../config-xmls/apl-up2/logical_partition.xml | 4 ++++ .../xmls/config-xmls/apl-up2/sdc.xml | 4 ++++ .../apl-up2/sdc_launch_1uos_aaag.xml | 3 +++ .../apl-up2/sdc_launch_1uos_laag.xml | 3 +++ .../ehl-crb-b/industry_launch_1uos_hardrt.xml | 4 +++- .../industry_launch_1uos_vxworks.xml | 4 +++- .../ehl-crb-b/industry_launch_1uos_waag.xml | 4 +++- .../ehl-crb-b/industry_launch_2uos.xml | 8 ++++++-- .../ehl-crb-b/industry_launch_6uos.xml | 20 +++++++++++++++++-- .../xmls/config-xmls/ehl-crb-b/sdc.xml | 4 ++++ .../ehl-crb-b/sdc_launch_1uos_laag.xml | 3 +++ .../ehl-crb-b/sdc_launch_1uos_zephyr.xml | 3 +++ .../generic/hybrid_launch_1uos.xml | 4 +++- .../generic/industry_launch_1uos.xml | 4 +++- .../generic/industry_launch_2uos.xml | 8 ++++++-- .../xmls/config-xmls/generic/sdc.xml | 4 ++++ .../config-xmls/generic/sdc_launch_1uos.xml | 3 +++ .../xmls/config-xmls/nuc6cayh/hybrid.xml | 4 ++++ .../xmls/config-xmls/nuc6cayh/industry.xml | 4 ++++ .../nuc6cayh/industry_launch_1uos_hardrt.xml | 3 +++ .../nuc6cayh/industry_launch_1uos_vxworks.xml | 3 +++ .../nuc6cayh/industry_launch_1uos_waag.xml | 3 +++ .../nuc6cayh/industry_launch_2uos.xml | 6 ++++++ .../nuc6cayh/industry_launch_6uos.xml | 18 +++++++++++++++++ .../nuc6cayh/logical_partition.xml | 4 ++++ .../xmls/config-xmls/nuc6cayh/sdc.xml | 4 ++++ .../nuc6cayh/sdc_launch_1uos_laag.xml | 3 +++ .../nuc6cayh/sdc_launch_1uos_zephyr.xml | 3 +++ .../nuc7i7dnb/industry_launch_1uos_hardrt.xml | 4 +++- .../industry_launch_1uos_vxworks.xml | 4 +++- .../nuc7i7dnb/industry_launch_1uos_waag.xml | 4 +++- .../nuc7i7dnb/industry_launch_2uos.xml | 8 ++++++-- .../nuc7i7dnb/industry_launch_6uos.xml | 20 +++++++++++++++++-- .../xmls/config-xmls/nuc7i7dnb/sdc.xml | 4 ++++ .../nuc7i7dnb/sdc_launch_1uos_laag.xml | 3 +++ .../nuc7i7dnb/sdc_launch_1uos_zephyr.xml | 3 +++ misc/vm_configs/xmls/config-xmls/qemu/sdc.xml | 4 ++++ .../template/LAUNCH_POST_RT_VM.xml | 3 +++ .../template/LAUNCH_POST_STD_VM.xml | 3 +++ .../tgl-rvp/industry_launch_1uos_waag.xml | 4 +++- .../tgl-rvp/industry_launch_2uos.xml | 8 ++++++-- .../xmls/config-xmls/tgl-rvp/sdc.xml | 4 ++++ .../tgl-rvp/sdc_launch_1uos_laag.xml | 3 +++ .../tgl-rvp/sdc_launch_1uos_zephyr.xml | 3 +++ .../industry_launch_1uos_hardrt.xml | 4 +++- .../industry_launch_1uos_vxworks.xml | 4 +++- .../whl-ipc-i5/industry_launch_1uos_waag.xml | 4 +++- .../whl-ipc-i5/industry_launch_2uos.xml | 8 ++++++-- .../whl-ipc-i5/industry_launch_6uos.xml | 20 +++++++++++++++++-- .../xmls/config-xmls/whl-ipc-i5/sdc.xml | 4 ++++ .../whl-ipc-i5/sdc_launch_1uos_laag.xml | 3 +++ .../whl-ipc-i5/sdc_launch_1uos_zephyr.xml | 3 +++ .../industry_launch_1uos_hardrt.xml | 4 +++- .../industry_launch_1uos_vxworks.xml | 4 +++- .../whl-ipc-i7/industry_launch_1uos_waag.xml | 4 +++- .../whl-ipc-i7/industry_launch_2uos.xml | 8 ++++++-- .../whl-ipc-i7/industry_launch_6uos.xml | 20 +++++++++++++++++-- .../xmls/config-xmls/whl-ipc-i7/sdc.xml | 4 ++++ .../whl-ipc-i7/sdc_launch_1uos_laag.xml | 3 +++ .../whl-ipc-i7/sdc_launch_1uos_zephyr.xml | 3 +++ 70 files changed, 325 insertions(+), 35 deletions(-) diff --git a/misc/vm_configs/xmls/config-xmls/apl-mrb/hybrid.xml b/misc/vm_configs/xmls/config-xmls/apl-mrb/hybrid.xml index f05a5f29d..f41b04692 100644 --- a/misc/vm_configs/xmls/config-xmls/apl-mrb/hybrid.xml +++ b/misc/vm_configs/xmls/config-xmls/apl-mrb/hybrid.xml @@ -27,6 +27,10 @@ y n n + + n + + diff --git a/misc/vm_configs/xmls/config-xmls/apl-mrb/industry.xml b/misc/vm_configs/xmls/config-xmls/apl-mrb/industry.xml index 8a237b2c1..22b5fcb70 100644 --- a/misc/vm_configs/xmls/config-xmls/apl-mrb/industry.xml +++ b/misc/vm_configs/xmls/config-xmls/apl-mrb/industry.xml @@ -27,6 +27,10 @@ y n n + + n + + diff --git a/misc/vm_configs/xmls/config-xmls/apl-mrb/sdc.xml b/misc/vm_configs/xmls/config-xmls/apl-mrb/sdc.xml index 61699a26f..0cefc1bde 100644 --- a/misc/vm_configs/xmls/config-xmls/apl-mrb/sdc.xml +++ b/misc/vm_configs/xmls/config-xmls/apl-mrb/sdc.xml @@ -27,6 +27,10 @@ y n n + + n + + diff --git a/misc/vm_configs/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aaag.xml b/misc/vm_configs/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aaag.xml index 80e20162b..2fdea0959 100644 --- a/misc/vm_configs/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aaag.xml +++ b/misc/vm_configs/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aaag.xml @@ -11,6 +11,9 @@ + + + 00:15.1 USB controller: Intel Corporation Device 5aaa (rev 0b) diff --git a/misc/vm_configs/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aliaag.xml b/misc/vm_configs/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aliaag.xml index a40aebe22..431798e32 100644 --- a/misc/vm_configs/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aliaag.xml +++ b/misc/vm_configs/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aliaag.xml @@ -11,6 +11,9 @@ + + + 00:15.1 USB controller: Intel Corporation Device 5aaa (rev 0b) diff --git a/misc/vm_configs/xmls/config-xmls/apl-mrb/sdc_launch_1uos_laag.xml b/misc/vm_configs/xmls/config-xmls/apl-mrb/sdc_launch_1uos_laag.xml index 904e817f2..ccddd6d9d 100644 --- a/misc/vm_configs/xmls/config-xmls/apl-mrb/sdc_launch_1uos_laag.xml +++ b/misc/vm_configs/xmls/config-xmls/apl-mrb/sdc_launch_1uos_laag.xml @@ -11,6 +11,9 @@ + + + 00:15.1 USB controller: Intel Corporation Device 5aaa (rev 0b) diff --git a/misc/vm_configs/xmls/config-xmls/apl-up2-n3350/logical_partition.xml b/misc/vm_configs/xmls/config-xmls/apl-up2-n3350/logical_partition.xml index 5bf00c20f..da00b180d 100644 --- a/misc/vm_configs/xmls/config-xmls/apl-up2-n3350/logical_partition.xml +++ b/misc/vm_configs/xmls/config-xmls/apl-up2-n3350/logical_partition.xml @@ -27,6 +27,10 @@ y n n + + n + + diff --git a/misc/vm_configs/xmls/config-xmls/apl-up2-n3350/sdc_launch_1uos_laag.xml b/misc/vm_configs/xmls/config-xmls/apl-up2-n3350/sdc_launch_1uos_laag.xml index 111248f7a..2348503bc 100644 --- a/misc/vm_configs/xmls/config-xmls/apl-up2-n3350/sdc_launch_1uos_laag.xml +++ b/misc/vm_configs/xmls/config-xmls/apl-up2-n3350/sdc_launch_1uos_laag.xml @@ -11,6 +11,9 @@ + + + 00:15.1 USB controller: Intel Corporation Device 5aaa (rev 0b) diff --git a/misc/vm_configs/xmls/config-xmls/apl-up2/hybrid.xml b/misc/vm_configs/xmls/config-xmls/apl-up2/hybrid.xml index 3089cef1c..f93bbedc2 100644 --- a/misc/vm_configs/xmls/config-xmls/apl-up2/hybrid.xml +++ b/misc/vm_configs/xmls/config-xmls/apl-up2/hybrid.xml @@ -27,6 +27,10 @@ y n n + + n + + diff --git a/misc/vm_configs/xmls/config-xmls/apl-up2/industry.xml b/misc/vm_configs/xmls/config-xmls/apl-up2/industry.xml index da834451f..3c9481260 100644 --- a/misc/vm_configs/xmls/config-xmls/apl-up2/industry.xml +++ b/misc/vm_configs/xmls/config-xmls/apl-up2/industry.xml @@ -27,6 +27,10 @@ y n n + + n + + diff --git a/misc/vm_configs/xmls/config-xmls/apl-up2/logical_partition.xml b/misc/vm_configs/xmls/config-xmls/apl-up2/logical_partition.xml index 63a5ff976..dd9ea441c 100644 --- a/misc/vm_configs/xmls/config-xmls/apl-up2/logical_partition.xml +++ b/misc/vm_configs/xmls/config-xmls/apl-up2/logical_partition.xml @@ -27,6 +27,10 @@ y n n + + n + + diff --git a/misc/vm_configs/xmls/config-xmls/apl-up2/sdc.xml b/misc/vm_configs/xmls/config-xmls/apl-up2/sdc.xml index 289528a26..821b9c7d2 100644 --- a/misc/vm_configs/xmls/config-xmls/apl-up2/sdc.xml +++ b/misc/vm_configs/xmls/config-xmls/apl-up2/sdc.xml @@ -27,6 +27,10 @@ y n n + + n + + diff --git a/misc/vm_configs/xmls/config-xmls/apl-up2/sdc_launch_1uos_aaag.xml b/misc/vm_configs/xmls/config-xmls/apl-up2/sdc_launch_1uos_aaag.xml index 54914ecdb..c1c903514 100644 --- a/misc/vm_configs/xmls/config-xmls/apl-up2/sdc_launch_1uos_aaag.xml +++ b/misc/vm_configs/xmls/config-xmls/apl-up2/sdc_launch_1uos_aaag.xml @@ -11,6 +11,9 @@ + + + 00:15.1 USB controller: Intel Corporation Device 5aaa (rev 0b) diff --git a/misc/vm_configs/xmls/config-xmls/apl-up2/sdc_launch_1uos_laag.xml b/misc/vm_configs/xmls/config-xmls/apl-up2/sdc_launch_1uos_laag.xml index 2eda5361a..11539f20c 100644 --- a/misc/vm_configs/xmls/config-xmls/apl-up2/sdc_launch_1uos_laag.xml +++ b/misc/vm_configs/xmls/config-xmls/apl-up2/sdc_launch_1uos_laag.xml @@ -11,6 +11,9 @@ + + + 00:15.1 USB controller: Intel Corporation Device 5aaa (rev 0b) diff --git a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_1uos_hardrt.xml b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_1uos_hardrt.xml index d99ae750a..e6578d621 100644 --- a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_1uos_hardrt.xml +++ b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_1uos_hardrt.xml @@ -11,7 +11,9 @@ - + + + diff --git a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_1uos_vxworks.xml b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_1uos_vxworks.xml index 30d044778..db38edea2 100644 --- a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_1uos_vxworks.xml +++ b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_1uos_vxworks.xml @@ -11,7 +11,9 @@ - + + + diff --git a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_1uos_waag.xml b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_1uos_waag.xml index 9ac1cd428..cd51f8be9 100644 --- a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_1uos_waag.xml +++ b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_1uos_waag.xml @@ -11,7 +11,9 @@ - + + + diff --git a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_2uos.xml b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_2uos.xml index bd9c3941c..70a7cb23e 100644 --- a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_2uos.xml +++ b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_2uos.xml @@ -11,7 +11,9 @@ - + + + @@ -47,7 +49,9 @@ - + + + diff --git a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_6uos.xml b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_6uos.xml index e0428f52f..4507518bd 100644 --- a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_6uos.xml +++ b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_6uos.xml @@ -11,7 +11,9 @@ - + + + @@ -47,7 +49,9 @@ - + + + @@ -82,6 +86,9 @@ + + +