From 922696de7e01c92e10c60b9483a707e4eb83bcfe Mon Sep 17 00:00:00 2001
From: Wei Liu <weix.w.liu@intel.com>
Date: Thu, 30 Jul 2020 17:42:30 +0800
Subject: [PATCH] acrn-config: remove RT guest flag configuration

Remove RT guest flags from logical partition
configuration.

Tracked-On: #5119
Signed-off-by: Wei Liu <weix.w.liu@intel.com>
Acked-by: Victor Sun <victor.sun@intel.com>
---
 misc/vm_configs/xmls/config-xmls/apl-mrb/logical_partition.xml | 3 +--
 .../xmls/config-xmls/apl-up2-n3350/logical_partition.xml       | 3 +--
 misc/vm_configs/xmls/config-xmls/apl-up2/logical_partition.xml | 3 +--
 .../xmls/config-xmls/ehl-crb-b/logical_partition.xml           | 3 +--
 misc/vm_configs/xmls/config-xmls/generic/logical_partition.xml | 3 +--
 .../vm_configs/xmls/config-xmls/nuc6cayh/logical_partition.xml | 3 +--
 .../xmls/config-xmls/nuc7i7dnb/logical_partition.xml           | 3 +--
 misc/vm_configs/xmls/config-xmls/tgl-rvp/logical_partition.xml | 3 +--
 .../xmls/config-xmls/whl-ipc-i5/logical_partition.xml          | 3 +--
 .../xmls/config-xmls/whl-ipc-i7/logical_partition.xml          | 3 +--
 10 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/misc/vm_configs/xmls/config-xmls/apl-mrb/logical_partition.xml b/misc/vm_configs/xmls/config-xmls/apl-mrb/logical_partition.xml
index ec149d389..76cae9fff 100644
--- a/misc/vm_configs/xmls/config-xmls/apl-mrb/logical_partition.xml
+++ b/misc/vm_configs/xmls/config-xmls/apl-mrb/logical_partition.xml
@@ -110,8 +110,7 @@
     <vm_type desc="Specify the VM type" readonly="true">PRE_STD_VM</vm_type>
     <name desc="vm_name">ACRN PRE-LAUNCHED VM1</name>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_RT</guest_flag>
-        <guest_flag>GUEST_FLAG_LAPIC_PASSTHROUGH</guest_flag>
+        <guest_flag></guest_flag>
     </guest_flags>
     <cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
         <pcpu_id>1</pcpu_id>
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 89d2eefb7..5bf00c20f 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
@@ -109,8 +109,7 @@
     <vm_type desc="Specify the VM type" readonly="true">PRE_STD_VM</vm_type>
     <name desc="vm_name">ACRN PRE-LAUNCHED VM1</name>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_RT</guest_flag>
-        <guest_flag>GUEST_FLAG_LAPIC_PASSTHROUGH</guest_flag>
+        <guest_flag></guest_flag>
     </guest_flags>
     <cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
         <pcpu_id>1</pcpu_id>
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 c9f34ebc2..63a5ff976 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
@@ -111,8 +111,7 @@
     <vm_type desc="Specify the VM type" readonly="true">PRE_STD_VM</vm_type>
     <name desc="vm_name">ACRN PRE-LAUNCHED VM1</name>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_RT</guest_flag>
-        <guest_flag>GUEST_FLAG_LAPIC_PASSTHROUGH</guest_flag>
+        <guest_flag></guest_flag>
     </guest_flags>
     <cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
         <pcpu_id>1</pcpu_id>
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 64e9ac8aa..66b3580d2 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
@@ -121,8 +121,7 @@
         <name desc="vm_name">ACRN PRE-LAUNCHED VM1</name>
         <uuid configurable="0" desc="vm uuid">dd87ce08-66f9-473d-bc58-7605837f935e</uuid>
         <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-            <guest_flag>GUEST_FLAG_RT</guest_flag>
-            <guest_flag>GUEST_FLAG_LAPIC_PASSTHROUGH</guest_flag>
+            <guest_flag></guest_flag>
         </guest_flags>
         <cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
             <pcpu_id>1</pcpu_id>
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 002ee16bd..1e9aabbe8 100644
--- a/misc/vm_configs/xmls/config-xmls/generic/logical_partition.xml
+++ b/misc/vm_configs/xmls/config-xmls/generic/logical_partition.xml
@@ -111,8 +111,7 @@
     <name desc="vm_name">ACRN PRE-LAUNCHED VM1</name>
     <uuid configurable="0" desc="vm uuid">dd87ce08-66f9-473d-bc58-7605837f935e</uuid>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_RT</guest_flag>
-        <guest_flag>GUEST_FLAG_LAPIC_PASSTHROUGH</guest_flag>
+        <guest_flag></guest_flag>
     </guest_flags>
     <cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
         <pcpu_id>1</pcpu_id>
diff --git a/misc/vm_configs/xmls/config-xmls/nuc6cayh/logical_partition.xml b/misc/vm_configs/xmls/config-xmls/nuc6cayh/logical_partition.xml
index 5667cc91c..210b43c86 100644
--- a/misc/vm_configs/xmls/config-xmls/nuc6cayh/logical_partition.xml
+++ b/misc/vm_configs/xmls/config-xmls/nuc6cayh/logical_partition.xml
@@ -111,8 +111,7 @@
     <vm_type desc="Specify the VM type" readonly="true">PRE_STD_VM</vm_type>
     <name desc="vm_name">ACRN PRE-LAUNCHED VM1</name>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_RT</guest_flag>
-        <guest_flag>GUEST_FLAG_LAPIC_PASSTHROUGH</guest_flag>
+        <guest_flag></guest_flag>
     </guest_flags>
     <cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
         <pcpu_id>1</pcpu_id>
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 15d02fd4c..053f3dd53 100644
--- a/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/logical_partition.xml
+++ b/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/logical_partition.xml
@@ -108,8 +108,7 @@
     <vm_type desc="Specify the VM type" readonly="true">PRE_STD_VM</vm_type>
     <name desc="vm_name">ACRN PRE-LAUNCHED VM1</name>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_RT</guest_flag>
-        <guest_flag>GUEST_FLAG_LAPIC_PASSTHROUGH</guest_flag>
+        <guest_flag></guest_flag>
     </guest_flags>
     <cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
         <pcpu_id>1</pcpu_id>
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 b201c967b..813822a9e 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
@@ -107,8 +107,7 @@
     <vm_type desc="Specify the VM type" readonly="true">PRE_STD_VM</vm_type>
     <name desc="vm_name">ACRN PRE-LAUNCHED VM1</name>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_RT</guest_flag>
-        <guest_flag>GUEST_FLAG_LAPIC_PASSTHROUGH</guest_flag>
+        <guest_flag></guest_flag>
     </guest_flags>
     <cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
         <pcpu_id>1</pcpu_id>
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 c1673f413..0495fa6af 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
@@ -107,8 +107,7 @@
     <vm_type desc="Specify the VM type" readonly="true">PRE_STD_VM</vm_type>
     <name desc="vm_name">ACRN PRE-LAUNCHED VM1</name>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_RT</guest_flag>
-        <guest_flag>GUEST_FLAG_LAPIC_PASSTHROUGH</guest_flag>
+        <guest_flag></guest_flag>
     </guest_flags>
     <cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
         <pcpu_id>1</pcpu_id>
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 12389503b..99fd9a624 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
@@ -107,8 +107,7 @@
     <vm_type desc="Specify the VM type" readonly="true">PRE_STD_VM</vm_type>
     <name desc="vm_name">ACRN PRE-LAUNCHED VM1</name>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>GUEST_FLAG_RT</guest_flag>
-        <guest_flag>GUEST_FLAG_LAPIC_PASSTHROUGH</guest_flag>
+        <guest_flag></guest_flag>
     </guest_flags>
     <cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
         <pcpu_id>1</pcpu_id>