From cd4e7786e6dafbd75ef7dcb21b2d00d5d86fc470 Mon Sep 17 00:00:00 2001
From: Junjie Mao <junjie.mao@intel.com>
Date: Sat, 29 Jan 2022 17:43:20 +0800
Subject: [PATCH] xforms: use values calculated from board XML as default
 values

Manually specifying MAX_IOAPIC_NUM and MAX_IOAPIC_LINES in a scenario XML
is still usable as a workaround on boards without IOAPIC (e.g. emulated
ones) or when the board inspector does not collect IOAPIC information
correctly.

This patch takes user-specified values of those items if
provided. Otherwise the automatically calculated values will be used
instead, as is done today.

Tracked-On: #6986
Signed-off-by: Junjie Mao <junjie.mao@intel.com>
---
 misc/config_tools/xforms/config_common.xsl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/misc/config_tools/xforms/config_common.xsl b/misc/config_tools/xforms/config_common.xsl
index 584989337..7be0d9ad1 100644
--- a/misc/config_tools/xforms/config_common.xsl
+++ b/misc/config_tools/xforms/config_common.xsl
@@ -17,11 +17,13 @@
     </xsl:call-template>
     <xsl:call-template name="integer-by-key-value">
       <xsl:with-param name="key" select="'MAX_IOAPIC_NUM'" />
-      <xsl:with-param name="value" select="count(//ioapic)" />
+      <xsl:with-param name="value" select="//config-data//MAX_IOAPIC_NUM/text()" />
+      <xsl:with-param name="default" select="count(.//ioapic)" />
     </xsl:call-template>
     <xsl:call-template name="integer-by-key-value">
       <xsl:with-param name="key" select="'MAX_IOAPIC_LINES'" />
-      <xsl:with-param name="value" select="math:max(//gsi_number/text() | exslt:node-set(0))" />
+      <xsl:with-param name="value" select="//config-data//MAX_IOAPIC_LINES/text()" />
+      <xsl:with-param name="default" select="math:max(.//ioapic/gsi_number/text() | exslt:node-set(0))" />
     </xsl:call-template>
     <xsl:call-template name="msi-msix-max" />
   </xsl:template>