From c25de24a92c26faa59e7d5e23966dd54215b66e4 Mon Sep 17 00:00:00 2001
From: Conghui <conghui.chen@intel.com>
Date: Mon, 25 Apr 2022 17:04:26 +0800
Subject: [PATCH] config-tools: remove board and scenario attributes

Remove board and scenario attributes from scenario XMLs

Tracked-On: #7345
Signed-off-by: Conghui <conghui.chen@intel.com>
Reviewed-by: Junjie Mao <junjie.mao@intel.com>
---
 misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml   | 2 +-
 misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml                | 2 +-
 misc/config_tools/data/cfl-k700-i7/partitioned.xml              | 2 +-
 misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml   | 2 +-
 misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml | 2 +-
 misc/config_tools/data/generic_board/hybrid_rt.xml              | 2 +-
 misc/config_tools/data/generic_board/partitioned.xml            | 2 +-
 misc/config_tools/data/generic_board/shared_launch_6user_vm.xml | 2 +-
 misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml    | 2 +-
 misc/config_tools/data/nuc11tnbi5/partitioned.xml               | 2 +-
 misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml    | 2 +-
 misc/config_tools/data/qemu/shared.xml                          | 2 +-
 misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml     | 2 +-
 .../config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml | 2 +-
 .../data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml   | 2 +-
 misc/config_tools/data/whl-ipc-i5/hybrid.xml                    | 2 +-
 .../data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml          | 2 +-
 misc/config_tools/data/whl-ipc-i5/partitioned.xml               | 2 +-
 .../data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml           | 2 +-
 .../data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml          | 2 +-
 .../data/whl-ipc-i5/shared_launch_1user_vm_waag.xml             | 2 +-
 misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml    | 2 +-
 misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml    | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml b/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml
index 31f745c07..b8c012683 100644
--- a/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml
+++ b/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml
@@ -1,4 +1,4 @@
-<acrn-config board="cfl-k700-i7" scenario="hybrid">
+<acrn-config>
   <hv>
     <DEBUG_OPTIONS>
       <BUILD_TYPE>debug</BUILD_TYPE>
diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
index d5fd9690a..a9c945d99 100644
--- a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
+++ b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
@@ -1,4 +1,4 @@
-<acrn-config board="cfl-k700-i7" scenario="hybrid_rt">
+<acrn-config>
   <hv>
     <DEBUG_OPTIONS>
       <BUILD_TYPE>debug</BUILD_TYPE>
diff --git a/misc/config_tools/data/cfl-k700-i7/partitioned.xml b/misc/config_tools/data/cfl-k700-i7/partitioned.xml
index e6a23d25c..1c875a3e9 100644
--- a/misc/config_tools/data/cfl-k700-i7/partitioned.xml
+++ b/misc/config_tools/data/cfl-k700-i7/partitioned.xml
@@ -1,4 +1,4 @@
-<acrn-config board="cfl-k700-i7" scenario="partitioned">
+<acrn-config>
   <hv>
     <DEBUG_OPTIONS>
       <BUILD_TYPE>debug</BUILD_TYPE>
diff --git a/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml b/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml
index 778cd76c7..93d431e15 100644
--- a/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml
+++ b/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml
@@ -1,4 +1,4 @@
-<acrn-config board="cfl-k700-i7" scenario="shared">
+<acrn-config>
   <hv>
     <DEBUG_OPTIONS>
       <BUILD_TYPE>debug</BUILD_TYPE>
diff --git a/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml b/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml
index c3f45c503..2baa0ada5 100644
--- a/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml
+++ b/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml
@@ -1,4 +1,4 @@
-<acrn-config board="generic_board" scenario="hybrid">
+<acrn-config>
   <hv>
     <DEBUG_OPTIONS>
       <BUILD_TYPE>debug</BUILD_TYPE>
diff --git a/misc/config_tools/data/generic_board/hybrid_rt.xml b/misc/config_tools/data/generic_board/hybrid_rt.xml
index f7bc614a1..ecd4ac14b 100644
--- a/misc/config_tools/data/generic_board/hybrid_rt.xml
+++ b/misc/config_tools/data/generic_board/hybrid_rt.xml
@@ -1,4 +1,4 @@
-<acrn-config board="generic_board" scenario="hybrid_rt">
+<acrn-config>
   <hv>
     <DEBUG_OPTIONS>
       <BUILD_TYPE>debug</BUILD_TYPE>
diff --git a/misc/config_tools/data/generic_board/partitioned.xml b/misc/config_tools/data/generic_board/partitioned.xml
index e4b8f061b..22844a7d7 100644
--- a/misc/config_tools/data/generic_board/partitioned.xml
+++ b/misc/config_tools/data/generic_board/partitioned.xml
@@ -1,4 +1,4 @@
-<acrn-config board="generic_board" scenario="partitioned">
+<acrn-config>
   <hv>
     <DEBUG_OPTIONS>
       <BUILD_TYPE>debug</BUILD_TYPE>
diff --git a/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml b/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml
index 8ead2a5ba..2c5ac6729 100644
--- a/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml
+++ b/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml
@@ -1,4 +1,4 @@
-<acrn-config board="generic_board" scenario="shared">
+<acrn-config>
   <hv>
     <DEBUG_OPTIONS>
       <BUILD_TYPE>debug</BUILD_TYPE>
diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml b/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml
index f2691c125..2baa0ada5 100644
--- a/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml
+++ b/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml
@@ -1,4 +1,4 @@
-<acrn-config board="nuc11tnbi5" scenario="hybrid">
+<acrn-config>
   <hv>
     <DEBUG_OPTIONS>
       <BUILD_TYPE>debug</BUILD_TYPE>
diff --git a/misc/config_tools/data/nuc11tnbi5/partitioned.xml b/misc/config_tools/data/nuc11tnbi5/partitioned.xml
index b89739572..237eeab29 100644
--- a/misc/config_tools/data/nuc11tnbi5/partitioned.xml
+++ b/misc/config_tools/data/nuc11tnbi5/partitioned.xml
@@ -1,4 +1,4 @@
-<acrn-config board="nuc11tnbi5" scenario="partitioned">
+<acrn-config>
   <hv>
     <DEBUG_OPTIONS>
       <BUILD_TYPE>debug</BUILD_TYPE>
diff --git a/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml b/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml
index cbe82416d..594c0bb45 100644
--- a/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml
+++ b/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml
@@ -1,4 +1,4 @@
-<acrn-config board="nuc11tnbi5" scenario="shared">
+<acrn-config>
   <hv>
     <DEBUG_OPTIONS>
       <BUILD_TYPE>debug</BUILD_TYPE>
diff --git a/misc/config_tools/data/qemu/shared.xml b/misc/config_tools/data/qemu/shared.xml
index 5b1a0a88f..df026e23c 100644
--- a/misc/config_tools/data/qemu/shared.xml
+++ b/misc/config_tools/data/qemu/shared.xml
@@ -1,4 +1,4 @@
-<acrn-config board="qemu" scenario="shared">
+<acrn-config>
   <hv>
     <DEBUG_OPTIONS>
       <BUILD_TYPE>debug</BUILD_TYPE>
diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml
index c06d88cc5..df7e43745 100644
--- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml
+++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml
@@ -1,4 +1,4 @@
-<acrn-config board="tgl-vecow-spc-7100-Corei7" scenario="hybrid">
+<acrn-config>
   <hv>
     <DEBUG_OPTIONS>
       <BUILD_TYPE>debug</BUILD_TYPE>
diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml
index bbec53f3f..5e080bd24 100644
--- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml
+++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml
@@ -1,4 +1,4 @@
-<acrn-config board="tgl-vecow-spc-7100-Corei7" scenario="partitioned">
+<acrn-config>
   <hv>
     <DEBUG_OPTIONS>
       <BUILD_TYPE>debug</BUILD_TYPE>
diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml
index 27f5941ab..2b4d7dadf 100644
--- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml
+++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml
@@ -1,4 +1,4 @@
-<acrn-config board="tgl-vecow-spc-7100-Corei7" scenario="shared">
+<acrn-config>
   <hv>
     <DEBUG_OPTIONS>
       <BUILD_TYPE>debug</BUILD_TYPE>
diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid.xml b/misc/config_tools/data/whl-ipc-i5/hybrid.xml
index 50a881654..3e1bdcc0d 100644
--- a/misc/config_tools/data/whl-ipc-i5/hybrid.xml
+++ b/misc/config_tools/data/whl-ipc-i5/hybrid.xml
@@ -1,4 +1,4 @@
-<acrn-config board="whl-ipc-i5" scenario="hybrid">
+<acrn-config>
   <hv>
     <DEBUG_OPTIONS>
       <BUILD_TYPE>debug</BUILD_TYPE>
diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml b/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml
index 662b77bbe..20858ac3d 100644
--- a/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml
+++ b/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml
@@ -1,4 +1,4 @@
-<acrn-config board="whl-ipc-i5" scenario="hybrid_rt">
+<acrn-config>
   <hv>
     <DEBUG_OPTIONS>
       <BUILD_TYPE>debug</BUILD_TYPE>
diff --git a/misc/config_tools/data/whl-ipc-i5/partitioned.xml b/misc/config_tools/data/whl-ipc-i5/partitioned.xml
index 65c7dba9c..20aaead6c 100644
--- a/misc/config_tools/data/whl-ipc-i5/partitioned.xml
+++ b/misc/config_tools/data/whl-ipc-i5/partitioned.xml
@@ -1,4 +1,4 @@
-<acrn-config board="whl-ipc-i5" scenario="partitioned">
+<acrn-config>
   <hv>
     <DEBUG_OPTIONS>
       <BUILD_TYPE>debug</BUILD_TYPE>
diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml
index 23136e14a..52a79d18e 100644
--- a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml
+++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml
@@ -1,4 +1,4 @@
-<acrn-config board="whl-ipc-i5" scenario="shared">
+<acrn-config>
   <hv>
     <DEBUG_OPTIONS>
       <BUILD_TYPE>debug</BUILD_TYPE>
diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml
index 02834e609..ac3a4e3ee 100644
--- a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml
+++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml
@@ -1,4 +1,4 @@
-<acrn-config board="whl-ipc-i5" scenario="shared">
+<acrn-config>
   <hv>
     <DEBUG_OPTIONS>
       <BUILD_TYPE>debug</BUILD_TYPE>
diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml
index 40c1437a6..ac732c2e7 100644
--- a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml
+++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml
@@ -1,4 +1,4 @@
-<acrn-config board="whl-ipc-i5" scenario="shared">
+<acrn-config>
   <hv>
     <DEBUG_OPTIONS>
       <BUILD_TYPE>debug</BUILD_TYPE>
diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml
index 82f5e7126..b20a90e29 100644
--- a/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml
+++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml
@@ -1,4 +1,4 @@
-<acrn-config board="whl-ipc-i5" scenario="shared">
+<acrn-config>
   <hv>
     <DEBUG_OPTIONS>
       <BUILD_TYPE>debug</BUILD_TYPE>
diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml
index 8cb65adc5..6c9b0f215 100644
--- a/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml
+++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml
@@ -1,4 +1,4 @@
-<acrn-config board="whl-ipc-i5" scenario="shared">
+<acrn-config>
   <hv>
     <DEBUG_OPTIONS>
       <BUILD_TYPE>debug</BUILD_TYPE>