From aed21877739c4eab20cb05fbb0c8997cda919e92 Mon Sep 17 00:00:00 2001
From: Weiyi Feng <weiyix.feng@intel.com>
Date: Thu, 11 Nov 2021 23:12:10 +0800
Subject: [PATCH] config_tools: filled vm to MAX_VM_NUM in vm_configurations.c

filled vm to MAX_VM_NUM in vm_configurations.c

Tracked-On: #6685
Signed-off-by: Weiyi Feng <weiyix.feng@intel.com>
---
 misc/config_tools/xforms/lib.xsl              | 22 +++++++++++++++++++
 .../xforms/vm_configurations.c.xsl            | 16 +++++++-------
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/misc/config_tools/xforms/lib.xsl b/misc/config_tools/xforms/lib.xsl
index b2ee7aa53..510793020 100644
--- a/misc/config_tools/xforms/lib.xsl
+++ b/misc/config_tools/xforms/lib.xsl
@@ -104,6 +104,28 @@
     </func:result>
   </func:function>
 
+    <func:function name="acrn:vm_fill">
+
+        <xsl:param name="cur"/>
+        <xsl:param name="end"/>
+
+        <func:result>
+            <xsl:text>,</xsl:text>
+            <xsl:value-of select="$newline"/>
+            <xsl:text>{</xsl:text>
+            <xsl:value-of select="acrn:comment(concat('Dynamic configured  VM', $cur))"/>
+            <xsl:value-of select="$newline"/>
+            <xsl:text>CONFIG_POST_STD_VM,</xsl:text>
+            <xsl:value-of select="$newline"/>
+            <xsl:text>}</xsl:text>
+            <xsl:value-of select="$newline"/>
+
+            <xsl:if test="not($cur + 1 = $end)">
+                <xsl:value-of select="acrn:vm_fill($cur + 1, $end)"/>
+            </xsl:if>
+        </func:result>
+    </func:function>
+
   <func:function name="acrn:min">
     <xsl:param name="a" />
     <xsl:param name="b" />
diff --git a/misc/config_tools/xforms/vm_configurations.c.xsl b/misc/config_tools/xforms/vm_configurations.c.xsl
index 6cf285d3a..45349dd5c 100644
--- a/misc/config_tools/xforms/vm_configurations.c.xsl
+++ b/misc/config_tools/xforms/vm_configurations.c.xsl
@@ -70,13 +70,15 @@
     <!-- Definition of vm_configs -->
     <xsl:value-of select="acrn:array-initializer('struct acrn_vm_config', 'vm_configs', 'CONFIG_MAX_VM_NUM')" />
     <xsl:apply-templates select="vm"/>
+    <xsl:value-of select="acrn:vm_fill(count(vm), hv/CAPACITIES/MAX_VM_NUM)"/>
+    <xsl:value-of select="$newline"/>
     <xsl:value-of select="$end_of_array_initializer" />
   </xsl:template>
 
   <xsl:template match="vm">
     <!-- Initializer of a acrn_vm_configs instance -->
     <xsl:text>{</xsl:text>
-    <xsl:value-of select="acrn:comment(concat('VM', @id))" />
+    <xsl:value-of select="acrn:comment(concat('Static configured VM', @id))" />
     <xsl:value-of select="$newline" />
 
     <xsl:apply-templates select="vm_type" />
@@ -105,17 +107,15 @@
     </xsl:if>
 
     <!-- End of the initializer -->
-    <xsl:text>},</xsl:text>
-    <xsl:value-of select="$newline" />
+    <xsl:text>}</xsl:text>
+    <xsl:if test="not(position() = last())">
+      <xsl:text>,</xsl:text>
+      <xsl:value-of select="$newline" />
+    </xsl:if>
   </xsl:template>
 
   <xsl:template match="vm_type">
     <xsl:value-of select="concat('CONFIG_', current())" />
-    <xsl:if test="not(acrn:is-sos-vm(current()))">
-      <xsl:text>(</xsl:text>
-      <xsl:value-of select="count(../preceding-sibling::vm[vm_type = current()]) + 1" />
-      <xsl:text>)</xsl:text>
-    </xsl:if>
     <xsl:text>,</xsl:text>
     <xsl:value-of select="$newline" />
   </xsl:template>