From a0751295345b0f403f7d3442850fcc395c5b8cea Mon Sep 17 00:00:00 2001
From: Kunhui-Li <kunhuix.li@intel.com>
Date: Tue, 31 Aug 2021 11:01:23 +0800
Subject: [PATCH] config_tools: update scenario xml files on tgl-rvp platform
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For SMBIOS and TPM, enable SECURITY_VM_FIXUP and add GUEST_FLAG_SECURITY_VM
flag in TGL hybrid_rt.xml. Then disable SECURITY_VM_FIXUP in TGL hybrid.xml
because it’s previously enabled in hybrid.xml instead of hybrid_rt.xml by
mistake.

Tracked-On: #6320
Signed-off-by: Kunhui-Li <kunhuix.li@intel.com>
---
 misc/config_tools/data/tgl-rvp/hybrid.xml    | 4 ++--
 misc/config_tools/data/tgl-rvp/hybrid_rt.xml | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/misc/config_tools/data/tgl-rvp/hybrid.xml b/misc/config_tools/data/tgl-rvp/hybrid.xml
index cf09be401..2e9b5c39c 100644
--- a/misc/config_tools/data/tgl-rvp/hybrid.xml
+++ b/misc/config_tools/data/tgl-rvp/hybrid.xml
@@ -17,7 +17,7 @@
         <MULTIBOOT2>y</MULTIBOOT2>
         <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
         <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP>
-        <SECURITY_VM_FIXUP>y</SECURITY_VM_FIXUP>
+        <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP>
         <RDT>
             <RDT_ENABLED>n</RDT_ENABLED>
             <CDP_ENABLED>n</CDP_ENABLED>
@@ -71,7 +71,7 @@
     <vm_type>SAFETY_VM</vm_type>
     <name>ACRN PRE-LAUNCHED VM0</name>
     <guest_flags>
-        <guest_flag>GUEST_FLAG_SECURITY_VM</guest_flag>
+        <guest_flag>0</guest_flag>
     </guest_flags>
     <cpu_affinity>
         <pcpu_id>3</pcpu_id>
diff --git a/misc/config_tools/data/tgl-rvp/hybrid_rt.xml b/misc/config_tools/data/tgl-rvp/hybrid_rt.xml
index ed629a556..00c7bf6e9 100644
--- a/misc/config_tools/data/tgl-rvp/hybrid_rt.xml
+++ b/misc/config_tools/data/tgl-rvp/hybrid_rt.xml
@@ -17,7 +17,7 @@
         <MULTIBOOT2>y</MULTIBOOT2>
         <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
         <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP>
-        <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP>
+        <SECURITY_VM_FIXUP>y</SECURITY_VM_FIXUP>
         <RDT>
             <RDT_ENABLED>n</RDT_ENABLED>
             <CDP_ENABLED>y</CDP_ENABLED>
@@ -76,6 +76,7 @@
     <guest_flags>
         <guest_flag>GUEST_FLAG_LAPIC_PASSTHROUGH</guest_flag>
         <guest_flag>GUEST_FLAG_RT</guest_flag>
+        <guest_flag>GUEST_FLAG_SECURITY_VM</guest_flag>
     </guest_flags>
     <cpu_affinity>
         <pcpu_id>2</pcpu_id>