From 9d27ec2df0e8655b7d2d13546db43b151172dfe5 Mon Sep 17 00:00:00 2001 From: Shuang Zheng Date: Tue, 4 Aug 2020 14:55:51 +0800 Subject: [PATCH] acrn-config: update config xmls to add Inter-VM configs add IVSHMEM_ENABLED and IVSHMEM_REGION in scenario xmls to support Inter-VM communications configuration for VMs. v2: move IVSHMEM config into section Tracked-On: #4853 Signed-off-by: Shuang Zheng Acked-by: Victor Sun --- misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid.xml | 4 ++++ misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry.xml | 4 ++++ .../xmls/config-xmls/ehl-crb-b/logical_partition.xml | 4 ++++ misc/vm_configs/xmls/config-xmls/generic/hybrid.xml | 4 ++++ misc/vm_configs/xmls/config-xmls/generic/hybrid_rt.xml | 4 ++++ misc/vm_configs/xmls/config-xmls/generic/industry.xml | 4 ++++ .../vm_configs/xmls/config-xmls/generic/logical_partition.xml | 4 ++++ misc/vm_configs/xmls/config-xmls/nuc7i7dnb/hybrid.xml | 4 ++++ misc/vm_configs/xmls/config-xmls/nuc7i7dnb/industry.xml | 4 ++++ .../xmls/config-xmls/nuc7i7dnb/logical_partition.xml | 4 ++++ misc/vm_configs/xmls/config-xmls/template/HV.xml | 4 ++++ misc/vm_configs/xmls/config-xmls/tgl-rvp/hybrid.xml | 4 ++++ misc/vm_configs/xmls/config-xmls/tgl-rvp/industry.xml | 4 ++++ .../vm_configs/xmls/config-xmls/tgl-rvp/logical_partition.xml | 4 ++++ misc/vm_configs/xmls/config-xmls/whl-ipc-i5/hybrid.xml | 4 ++++ misc/vm_configs/xmls/config-xmls/whl-ipc-i5/hybrid_rt.xml | 4 ++++ misc/vm_configs/xmls/config-xmls/whl-ipc-i5/industry.xml | 4 ++++ .../xmls/config-xmls/whl-ipc-i5/logical_partition.xml | 4 ++++ misc/vm_configs/xmls/config-xmls/whl-ipc-i7/hybrid.xml | 4 ++++ misc/vm_configs/xmls/config-xmls/whl-ipc-i7/hybrid_rt.xml | 4 ++++ misc/vm_configs/xmls/config-xmls/whl-ipc-i7/industry.xml | 4 ++++ .../xmls/config-xmls/whl-ipc-i7/logical_partition.xml | 4 ++++ 22 files changed, 88 insertions(+) diff --git a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid.xml b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid.xml index dcd770bae..9fbd8560c 100644 --- a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid.xml +++ b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid.xml @@ -39,6 +39,10 @@ y n n + + n + + 0x2000 diff --git a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry.xml b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry.xml index 217504368..0aa6372bc 100644 --- a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry.xml +++ b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry.xml @@ -39,6 +39,10 @@ y n n + + n + + 0x2000 diff --git a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/logical_partition.xml b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/logical_partition.xml index 66b3580d2..7478e51b0 100644 --- a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/logical_partition.xml +++ b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/logical_partition.xml @@ -39,6 +39,10 @@ y n n + + n + + 0x2000 diff --git a/misc/vm_configs/xmls/config-xmls/generic/hybrid.xml b/misc/vm_configs/xmls/config-xmls/generic/hybrid.xml index b9ce81245..a5eb0635c 100644 --- a/misc/vm_configs/xmls/config-xmls/generic/hybrid.xml +++ b/misc/vm_configs/xmls/config-xmls/generic/hybrid.xml @@ -25,6 +25,10 @@ y n n + + n + + diff --git a/misc/vm_configs/xmls/config-xmls/generic/hybrid_rt.xml b/misc/vm_configs/xmls/config-xmls/generic/hybrid_rt.xml index d55a25c39..69dbffac2 100644 --- a/misc/vm_configs/xmls/config-xmls/generic/hybrid_rt.xml +++ b/misc/vm_configs/xmls/config-xmls/generic/hybrid_rt.xml @@ -25,6 +25,10 @@ y n n + + n + + diff --git a/misc/vm_configs/xmls/config-xmls/generic/industry.xml b/misc/vm_configs/xmls/config-xmls/generic/industry.xml index 6f73c458d..24bce8169 100644 --- a/misc/vm_configs/xmls/config-xmls/generic/industry.xml +++ b/misc/vm_configs/xmls/config-xmls/generic/industry.xml @@ -25,6 +25,10 @@ y n n + + n + + diff --git a/misc/vm_configs/xmls/config-xmls/generic/logical_partition.xml b/misc/vm_configs/xmls/config-xmls/generic/logical_partition.xml index 1e9aabbe8..be0c132a3 100644 --- a/misc/vm_configs/xmls/config-xmls/generic/logical_partition.xml +++ b/misc/vm_configs/xmls/config-xmls/generic/logical_partition.xml @@ -25,6 +25,10 @@ y n n + + n + + diff --git a/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/hybrid.xml b/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/hybrid.xml index 973642a61..7508cda18 100644 --- a/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/hybrid.xml +++ b/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/hybrid.xml @@ -23,6 +23,10 @@ y n n + + n + + diff --git a/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/industry.xml b/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/industry.xml index 14e6cf489..b37a684c4 100644 --- a/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/industry.xml +++ b/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/industry.xml @@ -23,6 +23,10 @@ y n n + + n + + diff --git a/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/logical_partition.xml b/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/logical_partition.xml index 053f3dd53..cddd1b61c 100644 --- a/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/logical_partition.xml +++ b/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/logical_partition.xml @@ -23,6 +23,10 @@ y n n + + n + + diff --git a/misc/vm_configs/xmls/config-xmls/template/HV.xml b/misc/vm_configs/xmls/config-xmls/template/HV.xml index 6b736a272..c354e5519 100644 --- a/misc/vm_configs/xmls/config-xmls/template/HV.xml +++ b/misc/vm_configs/xmls/config-xmls/template/HV.xml @@ -25,6 +25,10 @@ y n n + + n + + diff --git a/misc/vm_configs/xmls/config-xmls/tgl-rvp/hybrid.xml b/misc/vm_configs/xmls/config-xmls/tgl-rvp/hybrid.xml index fa5b4d7b4..5a6f0be80 100644 --- a/misc/vm_configs/xmls/config-xmls/tgl-rvp/hybrid.xml +++ b/misc/vm_configs/xmls/config-xmls/tgl-rvp/hybrid.xml @@ -23,6 +23,10 @@ y n n + + n + + diff --git a/misc/vm_configs/xmls/config-xmls/tgl-rvp/industry.xml b/misc/vm_configs/xmls/config-xmls/tgl-rvp/industry.xml index d7e2c980e..e0679f77b 100644 --- a/misc/vm_configs/xmls/config-xmls/tgl-rvp/industry.xml +++ b/misc/vm_configs/xmls/config-xmls/tgl-rvp/industry.xml @@ -23,6 +23,10 @@ y n n + + n + + diff --git a/misc/vm_configs/xmls/config-xmls/tgl-rvp/logical_partition.xml b/misc/vm_configs/xmls/config-xmls/tgl-rvp/logical_partition.xml index 9f5fdf3e2..90301fcfa 100644 --- a/misc/vm_configs/xmls/config-xmls/tgl-rvp/logical_partition.xml +++ b/misc/vm_configs/xmls/config-xmls/tgl-rvp/logical_partition.xml @@ -23,6 +23,10 @@ y n n + + n + + diff --git a/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/hybrid.xml b/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/hybrid.xml index 36f200ba5..5ab080504 100644 --- a/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/hybrid.xml +++ b/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/hybrid.xml @@ -23,6 +23,10 @@ y n n + + n + + diff --git a/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/hybrid_rt.xml b/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/hybrid_rt.xml index 3f5f0e753..1dd1bbf90 100644 --- a/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/hybrid_rt.xml +++ b/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/hybrid_rt.xml @@ -23,6 +23,10 @@ y n n + + y + hv:/shm_region_0, 0x200000, 0:2 + diff --git a/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/industry.xml b/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/industry.xml index b53d741e5..951ddd73c 100644 --- a/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/industry.xml +++ b/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/industry.xml @@ -23,6 +23,10 @@ y n n + + n + + diff --git a/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/logical_partition.xml b/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/logical_partition.xml index 0495fa6af..ac40fb575 100644 --- a/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/logical_partition.xml +++ b/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/logical_partition.xml @@ -23,6 +23,10 @@ y n n + + n + + diff --git a/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/hybrid.xml b/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/hybrid.xml index 5bcd2650e..2a6f0139f 100644 --- a/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/hybrid.xml +++ b/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/hybrid.xml @@ -23,6 +23,10 @@ y n n + + n + + diff --git a/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/hybrid_rt.xml b/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/hybrid_rt.xml index a6651eecb..0623907ec 100644 --- a/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/hybrid_rt.xml +++ b/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/hybrid_rt.xml @@ -23,6 +23,10 @@ y n n + + n + + diff --git a/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/industry.xml b/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/industry.xml index e993358e4..357e562ca 100644 --- a/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/industry.xml +++ b/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/industry.xml @@ -23,6 +23,10 @@ y n n + + n + + diff --git a/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/logical_partition.xml b/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/logical_partition.xml index 99fd9a624..8f6bc3698 100644 --- a/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/logical_partition.xml +++ b/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/logical_partition.xml @@ -23,6 +23,10 @@ y n n + + n + +