diff --git a/misc/config_tools/xforms/config_common.xsl b/misc/config_tools/xforms/config_common.xsl
index eab3a62ef..c3e2a83b4 100644
--- a/misc/config_tools/xforms/config_common.xsl
+++ b/misc/config_tools/xforms/config_common.xsl
@@ -205,32 +205,24 @@
 	  <xsl:with-param name="key" select="'SERIAL_PIO_BASE'" />
 	  <xsl:with-param name="value" select="$base" />
 	</xsl:call-template>
+        <xsl:if test="$bdf != ''">
+          <xsl:call-template name="boolean-by-key-value">
+	          <xsl:with-param name="key" select="'SERIAL_PCI'" />
+	          <xsl:with-param name="value" select="'y'" />
+	        </xsl:call-template>
+          <xsl:variable name="serial_bdf" select="acrn:binary-bdf($bdf)" />
+	        <xsl:call-template name="integer-by-key-value">
+	          <xsl:with-param name="key" select="'SERIAL_PCI_BDF'" />
+	          <xsl:with-param name="value" select="$serial_bdf" />
+	        </xsl:call-template>
+        </xsl:if>
       </xsl:when>
       <xsl:when test="($type = 'mmio') and ($bdf != '')">
 	<xsl:call-template name="boolean-by-key-value">
 	  <xsl:with-param name="key" select="'SERIAL_PCI'" />
 	  <xsl:with-param name="value" select="'y'" />
 	</xsl:call-template>
-
-	<xsl:variable name="bus" select="substring-before($bdf, ':')" />
-	<xsl:variable name="device" select="substring-before(substring-after($bdf, ':'), '.')" />
-	<xsl:variable name="function" select="substring-after($bdf, '.')" />
-	<xsl:variable name="serial_bdf">
-	  <xsl:text>0b</xsl:text>
-	  <xsl:call-template name="hex-to-bin">
-	    <xsl:with-param name="s" select="$bus" />
-	    <xsl:with-param name="width" select="4" />
-	  </xsl:call-template>
-	  <xsl:call-template name="hex-to-bin">
-	    <xsl:with-param name="s" select="$device" />
-	    <xsl:with-param name="width" select="1" />
-	  </xsl:call-template>
-	  <xsl:call-template name="hex-to-bin">
-	    <xsl:with-param name="s" select="$function" />
-	    <xsl:with-param name="width" select="3" />
-	  </xsl:call-template>
-	</xsl:variable>
-
+       <xsl:variable name="serial_bdf" select="acrn:binary-bdf($bdf)" />
 	<xsl:call-template name="integer-by-key-value">
 	  <xsl:with-param name="key" select="'SERIAL_PCI_BDF'" />
 	  <xsl:with-param name="value" select="$serial_bdf" />
diff --git a/misc/config_tools/xforms/lib.xsl b/misc/config_tools/xforms/lib.xsl
index 8974cc16a..7adf2dd47 100644
--- a/misc/config_tools/xforms/lib.xsl
+++ b/misc/config_tools/xforms/lib.xsl
@@ -544,6 +544,29 @@
     <func:result select="$unique_mapping" />
   </func:function>
 
+  <func:function name="acrn:binary-bdf">
+      <xsl:param name="bdf" />
+      <xsl:variable name="bus" select="substring-before($bdf, ':')" />
+      <xsl:variable name="device" select="substring-before(substring-after($bdf, ':'), '.')" />
+      <xsl:variable name="function" select="substring-after($bdf, '.')" />
+      <xsl:variable name="serial_bdf">
+        <xsl:text>0b</xsl:text>
+        <xsl:call-template name="hex-to-bin">
+          <xsl:with-param name="s" select="$bus" />
+          <xsl:with-param name="width" select="4" />
+        </xsl:call-template>
+        <xsl:call-template name="hex-to-bin">
+          <xsl:with-param name="s" select="$device" />
+          <xsl:with-param name="width" select="1" />
+        </xsl:call-template>
+        <xsl:call-template name="hex-to-bin">
+          <xsl:with-param name="s" select="$function" />
+          <xsl:with-param name="width" select="3" />
+        </xsl:call-template>
+      </xsl:variable>
+      <func:result select="$serial_bdf" />
+  </func:function>
+
   <func:function name="acrn:get-vbdf">
     <xsl:param name="vmid" />
     <xsl:param name="name" />