From 0266292ed65d52da14e724089a353dc06291abcd Mon Sep 17 00:00:00 2001
From: Wei Liu <weix.w.liu@intel.com>
Date: Sat, 25 Jul 2020 17:17:40 +0800
Subject: [PATCH] acrn-config: refinemen config xmls for hybrid rt

1.Refine cpu affinity in hybrid rt xmls for whl-ipc-i5/7
2.Refine guest flag for hybrid rt xmls for whl-ipc-i5/7

Tracked-On: #5081
Signed-off-by: Wei Liu <weix.w.liu@intel.com>
Acked-by: Victor Sun <victor.sun@intel.com>
---
 misc/acrn-config/library/common.py                         | 3 +--
 misc/acrn-config/xmls/config-xmls/template/PRE_RT_VM.xml   | 3 ++-
 misc/acrn-config/xmls/config-xmls/whl-ipc-i5/hybrid_rt.xml | 6 ++++--
 misc/acrn-config/xmls/config-xmls/whl-ipc-i7/hybrid_rt.xml | 6 ++++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/misc/acrn-config/library/common.py b/misc/acrn-config/library/common.py
index 73e3f3410..9a9fb7943 100644
--- a/misc/acrn-config/library/common.py
+++ b/misc/acrn-config/library/common.py
@@ -216,10 +216,9 @@ def find_tmp_flag(flag):
     if flag == None or flag == '0':
         return '0UL'
 
-    flag_str = ''
     for i in range(len(GUEST_FLAG)):
         if flag == GUEST_FLAG[i]:
-            return flag_str
+            return flag
 
 
 def get_config_root(config_file):
diff --git a/misc/acrn-config/xmls/config-xmls/template/PRE_RT_VM.xml b/misc/acrn-config/xmls/config-xmls/template/PRE_RT_VM.xml
index 9231b3469..ed76a0121 100644
--- a/misc/acrn-config/xmls/config-xmls/template/PRE_RT_VM.xml
+++ b/misc/acrn-config/xmls/config-xmls/template/PRE_RT_VM.xml
@@ -3,7 +3,8 @@
     <vm_type desc="Specify the VM by its load order: PRE_LAUNCHED_VM, SOS_VM or POST_LAUNCHED_VM." readonly="true">PRE_RT_VM</vm_type>
     <name desc="Specify the VM name which will be shown in hypervisor console command: vm_list."></name>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag></guest_flag>
+        <guest_flag>GUEST_FLAG_LAPIC_PASSTHROUGH</guest_flag>
+        <guest_flag>GUEST_FLAG_RT</guest_flag>
     </guest_flags>
     <cpu_affinity desc="List of pCPU: the guest VM is allowed to create vCPU from all or a subset of this list.">
         <pcpu_id></pcpu_id>
diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/hybrid_rt.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/hybrid_rt.xml
index 45b90cda9..85fce0899 100644
--- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/hybrid_rt.xml
+++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/hybrid_rt.xml
@@ -56,9 +56,11 @@
     <vm_type desc="Specify the VM type" readonly="true">PRE_RT_VM</vm_type>
     <name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN PRE-LAUNCHED VM0</name>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>0</guest_flag>
+        <guest_flag>GUEST_FLAG_LAPIC_PASSTHROUGH</guest_flag>
+        <guest_flag>GUEST_FLAG_RT</guest_flag>
     </guest_flags>
     <cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
+        <pcpu_id>2</pcpu_id>
         <pcpu_id>3</pcpu_id>
     </cpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
@@ -147,7 +149,7 @@
         <guest_flag>0</guest_flag>
     </guest_flags>
     <cpu_affinity desc="List of pCPU: the guest VM is allowed to create vCPU from all or a subset of this list.">
-        <pcpu_id>2</pcpu_id>
+        <pcpu_id>1</pcpu_id>
     </cpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
         <vcpu_clos>0</vcpu_clos>
diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/hybrid_rt.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/hybrid_rt.xml
index 2eea0e67f..6658a5f56 100644
--- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/hybrid_rt.xml
+++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/hybrid_rt.xml
@@ -56,9 +56,11 @@
     <vm_type desc="Specify the VM type" readonly="true">PRE_RT_VM</vm_type>
     <name desc="Specify the VM name which will be shown in hypervisor console command: vm_list.">ACRN PRE-LAUNCHED VM0</name>
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
-        <guest_flag>0</guest_flag>
+        <guest_flag>GUEST_FLAG_LAPIC_PASSTHROUGH</guest_flag>
+        <guest_flag>GUEST_FLAG_RT</guest_flag>
     </guest_flags>
     <cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
+        <pcpu_id>2</pcpu_id>
         <pcpu_id>3</pcpu_id>
     </cpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
@@ -147,7 +149,7 @@
         <guest_flag>0</guest_flag>
     </guest_flags>
     <cpu_affinity desc="List of pCPU: the guest VM is allowed to create vCPU from all or a subset of this list.">
-        <pcpu_id>2</pcpu_id>
+        <pcpu_id>1</pcpu_id>
     </cpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
         <vcpu_clos>0</vcpu_clos>