From 2dd5bbd959717d23d0225aa6366db55d64497cd1 Mon Sep 17 00:00:00 2001
From: "Yang,Yu-chu" <yu-chu.yang@intel.com>
Date: Wed, 16 Feb 2022 17:48:52 -0800
Subject: [PATCH] config-tools: remove SERIAL_CONSOLE extracion for bootargs of
 SOS

Remove the logic to parse SERIAL_CONSOLE and append to bootargs. Specify the console in bootargs directly.

Tracked-On: #7127
Signed-off-by: Yang,Yu-chu <yu-chu.yang@intel.com>
Reviewed-by: Junjie Mao <junjie.mao@intel.com>
Acked-by: Anthony Xu <anthony.xu@intel.com>
---
 misc/config_tools/xforms/misc_cfg.h.xsl       | 19 -------------------
 .../xforms/vm_configurations.h.xsl            |  2 +-
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/misc/config_tools/xforms/misc_cfg.h.xsl b/misc/config_tools/xforms/misc_cfg.h.xsl
index b5a6dc9c0..5345e1035 100644
--- a/misc/config_tools/xforms/misc_cfg.h.xsl
+++ b/misc/config_tools/xforms/misc_cfg.h.xsl
@@ -35,7 +35,6 @@
 
   <xsl:template match="config-data/acrn-config">
     <xsl:if test="count(vm[acrn:is-service-vm(load_order)])">
-      <xsl:call-template name="sos_serial_console" />
       <xsl:call-template name="sos_bootargs_diff" />
     </xsl:if>
     <xsl:call-template name="cpu_affinity" />
@@ -64,24 +63,6 @@
     </xsl:for-each>
   </xsl:template>
 
-<xsl:template name="sos_serial_console">
-  <xsl:variable name="consoleport" select="hv/DEBUG_OPTIONS/SERIAL_CONSOLE" />
-  <xsl:variable name="sos_console">
-    <xsl:if test="$consoleport = ''">
-      <xsl:text>" "</xsl:text>
-    </xsl:if>
-    <xsl:if test="$consoleport != ''">
-      <xsl:if test="contains($consoleport, '/')">
-        <xsl:value-of select="concat($quot, 'console=', substring-after(substring-after($consoleport,'/'), '/'), ' ', $quot)" />
-      </xsl:if>
-      <xsl:if test="not(contains($consoleport, '/'))">
-        <xsl:value-of select="concat($quot, 'console=', $consoleport, ' ', $quot)" />
-      </xsl:if>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:value-of select="acrn:define('SERVICE_VM_OS_CONSOLE', $sos_console, '')" />
-</xsl:template>
-
 <xsl:template name="sos_bootargs_diff">
   <xsl:variable name="sos_rootfs">
   <xsl:variable name="bootargs" select="str:split(//vm[acrn:is-service-vm(load_order)]/os_config/bootargs[text()], ' ')" />
diff --git a/misc/config_tools/xforms/vm_configurations.h.xsl b/misc/config_tools/xforms/vm_configurations.h.xsl
index b48fb8368..281abcfa8 100644
--- a/misc/config_tools/xforms/vm_configurations.h.xsl
+++ b/misc/config_tools/xforms/vm_configurations.h.xsl
@@ -48,7 +48,7 @@
     <xsl:if test="count(vm[load_order='SERVICE_VM'])">
       <xsl:value-of select="acrn:comment(concat('SERVICE_VM == VM', vm[load_order='SERVICE_VM']/@id))" />
       <xsl:value-of select="$newline" />
-      <xsl:value-of select="acrn:define('SERVICE_VM_OS_BOOTARGS', 'SERVICE_VM_ROOTFS SERVICE_VM_OS_CONSOLE SERVICE_VM_IDLE SERVICE_VM_BOOTARGS_DIFF', '')" />
+      <xsl:value-of select="acrn:define('SERVICE_VM_OS_BOOTARGS', 'SERVICE_VM_ROOTFS SERVICE_VM_IDLE SERVICE_VM_BOOTARGS_DIFF', '')" />
     </xsl:if>
   </xsl:template>