diff --git a/misc/config_tools/data/adl-rvp/industry.xml b/misc/config_tools/data/adl-rvp/industry.xml
index e1df8867f..b70ca7959 100755
--- a/misc/config_tools/data/adl-rvp/industry.xml
+++ b/misc/config_tools/data/adl-rvp/industry.xml
@@ -50,7 +50,7 @@
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
         <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
         <MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
-        <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+        <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
         <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
     </CAPACITIES>
 
diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
index a4684e6f7..cc8e72fc0 100644
--- a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
+++ b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
@@ -47,7 +47,7 @@
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
         <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
         <MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
-        <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+        <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
         <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
     </CAPACITIES>
 
diff --git a/misc/config_tools/data/cfl-k700-i7/industry.xml b/misc/config_tools/data/cfl-k700-i7/industry.xml
index 1fa3668ba..b4fce031a 100644
--- a/misc/config_tools/data/cfl-k700-i7/industry.xml
+++ b/misc/config_tools/data/cfl-k700-i7/industry.xml
@@ -47,7 +47,7 @@
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
         <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
         <MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
-        <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+        <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
         <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
     </CAPACITIES>
 
diff --git a/misc/config_tools/data/ehl-crb-b/fusa_partition.xml b/misc/config_tools/data/ehl-crb-b/fusa_partition.xml
index 641925cf7..9f73e9747 100644
--- a/misc/config_tools/data/ehl-crb-b/fusa_partition.xml
+++ b/misc/config_tools/data/ehl-crb-b/fusa_partition.xml
@@ -60,7 +60,7 @@
             <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
             <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
             <MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
-            <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+            <MAX_MSIX_TABLE_NUM>96</MAX_MSIX_TABLE_NUM>
             <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
         </CAPACITIES>
         <MISC_CFG>
diff --git a/misc/config_tools/data/ehl-crb-b/hybrid.xml b/misc/config_tools/data/ehl-crb-b/hybrid.xml
index f65eba8c7..00ecef5c4 100644
--- a/misc/config_tools/data/ehl-crb-b/hybrid.xml
+++ b/misc/config_tools/data/ehl-crb-b/hybrid.xml
@@ -60,7 +60,7 @@
             <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
             <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
             <MAX_PT_IRQ_ENTRIES>256</MAX_PT_IRQ_ENTRIES>
-            <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+            <MAX_MSIX_TABLE_NUM>96</MAX_MSIX_TABLE_NUM>
             <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
         </CAPACITIES>
         <MISC_CFG>
diff --git a/misc/config_tools/data/ehl-crb-b/hybrid_rt.xml b/misc/config_tools/data/ehl-crb-b/hybrid_rt.xml
index 70adac06e..cab433e80 100644
--- a/misc/config_tools/data/ehl-crb-b/hybrid_rt.xml
+++ b/misc/config_tools/data/ehl-crb-b/hybrid_rt.xml
@@ -63,7 +63,7 @@
             <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
             <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
             <MAX_PT_IRQ_ENTRIES>256</MAX_PT_IRQ_ENTRIES>
-            <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+            <MAX_MSIX_TABLE_NUM>96</MAX_MSIX_TABLE_NUM>
             <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
         </CAPACITIES>
         <MISC_CFG>
diff --git a/misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml b/misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml
index 416ecafc9..4ba186cc0 100644
--- a/misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml
+++ b/misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml
@@ -60,7 +60,7 @@
             <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
             <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
             <MAX_PT_IRQ_ENTRIES>256</MAX_PT_IRQ_ENTRIES>
-            <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+            <MAX_MSIX_TABLE_NUM>96</MAX_MSIX_TABLE_NUM>
             <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
         </CAPACITIES>
         <MISC_CFG>
diff --git a/misc/config_tools/data/ehl-crb-b/industry.xml b/misc/config_tools/data/ehl-crb-b/industry.xml
index e511c7f66..f7dfed35f 100644
--- a/misc/config_tools/data/ehl-crb-b/industry.xml
+++ b/misc/config_tools/data/ehl-crb-b/industry.xml
@@ -63,7 +63,7 @@
             <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
             <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
             <MAX_PT_IRQ_ENTRIES>256</MAX_PT_IRQ_ENTRIES>
-            <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+            <MAX_MSIX_TABLE_NUM>96</MAX_MSIX_TABLE_NUM>
             <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
         </CAPACITIES>
         <MISC_CFG>
diff --git a/misc/config_tools/data/ehl-crb-b/logical_partition.xml b/misc/config_tools/data/ehl-crb-b/logical_partition.xml
index e154d5098..02d71e223 100644
--- a/misc/config_tools/data/ehl-crb-b/logical_partition.xml
+++ b/misc/config_tools/data/ehl-crb-b/logical_partition.xml
@@ -60,7 +60,7 @@
             <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
             <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
             <MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
-            <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+            <MAX_MSIX_TABLE_NUM>96</MAX_MSIX_TABLE_NUM>
             <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
         </CAPACITIES>
         <MISC_CFG>
diff --git a/misc/config_tools/data/ehl-crb-b/sdc.xml b/misc/config_tools/data/ehl-crb-b/sdc.xml
index 9c1d7854f..6361a4c60 100644
--- a/misc/config_tools/data/ehl-crb-b/sdc.xml
+++ b/misc/config_tools/data/ehl-crb-b/sdc.xml
@@ -60,7 +60,7 @@
             <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
             <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
             <MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
-            <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+            <MAX_MSIX_TABLE_NUM>96</MAX_MSIX_TABLE_NUM>
             <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
         </CAPACITIES>
         <MISC_CFG>
diff --git a/misc/config_tools/data/generic_board/hybrid.xml b/misc/config_tools/data/generic_board/hybrid.xml
index 71aeab96a..01e89f98d 100644
--- a/misc/config_tools/data/generic_board/hybrid.xml
+++ b/misc/config_tools/data/generic_board/hybrid.xml
@@ -61,7 +61,7 @@
             <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
             <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
             <MAX_PT_IRQ_ENTRIES>256</MAX_PT_IRQ_ENTRIES>
-            <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+            <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
             <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
         </CAPACITIES>
         <MISC_CFG>
diff --git a/misc/config_tools/data/generic_board/hybrid_rt.xml b/misc/config_tools/data/generic_board/hybrid_rt.xml
index a970c9cc1..44207a835 100644
--- a/misc/config_tools/data/generic_board/hybrid_rt.xml
+++ b/misc/config_tools/data/generic_board/hybrid_rt.xml
@@ -61,7 +61,7 @@
             <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
             <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
             <MAX_PT_IRQ_ENTRIES>256</MAX_PT_IRQ_ENTRIES>
-            <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+            <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
             <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
         </CAPACITIES>
         <MISC_CFG>
diff --git a/misc/config_tools/data/generic_board/industry.xml b/misc/config_tools/data/generic_board/industry.xml
index bdd786ba6..674bc65c7 100644
--- a/misc/config_tools/data/generic_board/industry.xml
+++ b/misc/config_tools/data/generic_board/industry.xml
@@ -61,7 +61,7 @@
             <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
             <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
             <MAX_PT_IRQ_ENTRIES>256</MAX_PT_IRQ_ENTRIES>
-            <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+            <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
             <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
         </CAPACITIES>
         <MISC_CFG>
diff --git a/misc/config_tools/data/generic_board/logical_partition.xml b/misc/config_tools/data/generic_board/logical_partition.xml
index d969a3cdc..84e1cb5fb 100644
--- a/misc/config_tools/data/generic_board/logical_partition.xml
+++ b/misc/config_tools/data/generic_board/logical_partition.xml
@@ -61,7 +61,7 @@
             <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
             <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
             <MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
-            <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+            <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
             <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
         </CAPACITIES>
         <MISC_CFG>
diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid.xml b/misc/config_tools/data/nuc11tnbi5/hybrid.xml
index 005087ceb..76f387b84 100644
--- a/misc/config_tools/data/nuc11tnbi5/hybrid.xml
+++ b/misc/config_tools/data/nuc11tnbi5/hybrid.xml
@@ -59,7 +59,7 @@
       <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
       <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
       <MAX_PT_IRQ_ENTRIES>256</MAX_PT_IRQ_ENTRIES>
-      <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+      <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
       <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
     </CAPACITIES>
     <MISC_CFG>
diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid_rt.xml b/misc/config_tools/data/nuc11tnbi5/hybrid_rt.xml
index ff8c7e57f..41ef90775 100644
--- a/misc/config_tools/data/nuc11tnbi5/hybrid_rt.xml
+++ b/misc/config_tools/data/nuc11tnbi5/hybrid_rt.xml
@@ -59,7 +59,7 @@
       <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
       <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
       <MAX_PT_IRQ_ENTRIES>256</MAX_PT_IRQ_ENTRIES>
-      <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+      <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
       <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
     </CAPACITIES>
     <MISC_CFG>
diff --git a/misc/config_tools/data/nuc11tnbi5/industry.xml b/misc/config_tools/data/nuc11tnbi5/industry.xml
index bf8eb854f..3bdcaac04 100644
--- a/misc/config_tools/data/nuc11tnbi5/industry.xml
+++ b/misc/config_tools/data/nuc11tnbi5/industry.xml
@@ -51,7 +51,7 @@
       <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
       <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
       <MAX_PT_IRQ_ENTRIES>256</MAX_PT_IRQ_ENTRIES>
-      <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+      <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
       <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
     </CAPACITIES>
     <MISC_CFG>
diff --git a/misc/config_tools/data/nuc11tnbi5/logical_partition.xml b/misc/config_tools/data/nuc11tnbi5/logical_partition.xml
index 72a5a169e..4b2a61dc5 100644
--- a/misc/config_tools/data/nuc11tnbi5/logical_partition.xml
+++ b/misc/config_tools/data/nuc11tnbi5/logical_partition.xml
@@ -59,7 +59,7 @@
       <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
       <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
       <MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
-      <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+      <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
       <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
     </CAPACITIES>
     <MISC_CFG>
diff --git a/misc/config_tools/data/nuc7i7dnb/hybrid.xml b/misc/config_tools/data/nuc7i7dnb/hybrid.xml
index 4a5ec2bbc..73f24ca28 100644
--- a/misc/config_tools/data/nuc7i7dnb/hybrid.xml
+++ b/misc/config_tools/data/nuc7i7dnb/hybrid.xml
@@ -47,7 +47,7 @@
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
         <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
         <MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
-        <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+        <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
         <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
     </CAPACITIES>
 
diff --git a/misc/config_tools/data/nuc7i7dnb/industry.xml b/misc/config_tools/data/nuc7i7dnb/industry.xml
index 0ac89385a..290e27732 100644
--- a/misc/config_tools/data/nuc7i7dnb/industry.xml
+++ b/misc/config_tools/data/nuc7i7dnb/industry.xml
@@ -47,7 +47,7 @@
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
         <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
         <MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
-        <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+        <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
         <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
     </CAPACITIES>
 
diff --git a/misc/config_tools/data/nuc7i7dnb/logical_partition.xml b/misc/config_tools/data/nuc7i7dnb/logical_partition.xml
index 1381ab330..631cf18d9 100644
--- a/misc/config_tools/data/nuc7i7dnb/logical_partition.xml
+++ b/misc/config_tools/data/nuc7i7dnb/logical_partition.xml
@@ -47,7 +47,7 @@
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
         <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
         <MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
-        <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+        <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
         <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
     </CAPACITIES>
 
diff --git a/misc/config_tools/data/nuc7i7dnb/sdc.xml b/misc/config_tools/data/nuc7i7dnb/sdc.xml
index 6ab63c630..1e779b2fa 100644
--- a/misc/config_tools/data/nuc7i7dnb/sdc.xml
+++ b/misc/config_tools/data/nuc7i7dnb/sdc.xml
@@ -47,7 +47,7 @@
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
         <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
         <MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
-        <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+        <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
         <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
     </CAPACITIES>
 
diff --git a/misc/config_tools/data/qemu/sdc.xml b/misc/config_tools/data/qemu/sdc.xml
index e5bbe897d..0ebff33f8 100644
--- a/misc/config_tools/data/qemu/sdc.xml
+++ b/misc/config_tools/data/qemu/sdc.xml
@@ -47,7 +47,7 @@
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
         <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
         <MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
-        <MAX_MSIX_TABLE_NUM>16</MAX_MSIX_TABLE_NUM>
+        <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
         <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
     </CAPACITIES>
 
diff --git a/misc/config_tools/data/tgl-rvp/hybrid.xml b/misc/config_tools/data/tgl-rvp/hybrid.xml
index 826c90de4..185620f5b 100644
--- a/misc/config_tools/data/tgl-rvp/hybrid.xml
+++ b/misc/config_tools/data/tgl-rvp/hybrid.xml
@@ -55,7 +55,7 @@
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
         <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
         <MAX_PT_IRQ_ENTRIES>128</MAX_PT_IRQ_ENTRIES>
-        <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+        <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
         <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
     </CAPACITIES>
 
diff --git a/misc/config_tools/data/tgl-rvp/hybrid_rt.xml b/misc/config_tools/data/tgl-rvp/hybrid_rt.xml
index 4e8dcf861..662aa1aa2 100644
--- a/misc/config_tools/data/tgl-rvp/hybrid_rt.xml
+++ b/misc/config_tools/data/tgl-rvp/hybrid_rt.xml
@@ -58,7 +58,7 @@
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
         <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
         <MAX_PT_IRQ_ENTRIES>128</MAX_PT_IRQ_ENTRIES>
-        <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+        <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
         <MAX_EMULATED_MMIO>32</MAX_EMULATED_MMIO>
     </CAPACITIES>
 
diff --git a/misc/config_tools/data/tgl-rvp/industry.xml b/misc/config_tools/data/tgl-rvp/industry.xml
index ee12bb96a..ba1c66ce9 100644
--- a/misc/config_tools/data/tgl-rvp/industry.xml
+++ b/misc/config_tools/data/tgl-rvp/industry.xml
@@ -54,7 +54,7 @@
       <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
       <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
       <MAX_PT_IRQ_ENTRIES>128</MAX_PT_IRQ_ENTRIES>
-      <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+      <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
       <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
     </CAPACITIES>
     <MISC_CFG>
diff --git a/misc/config_tools/data/tgl-rvp/logical_partition.xml b/misc/config_tools/data/tgl-rvp/logical_partition.xml
index b3ea07926..b59d8fe93 100644
--- a/misc/config_tools/data/tgl-rvp/logical_partition.xml
+++ b/misc/config_tools/data/tgl-rvp/logical_partition.xml
@@ -55,7 +55,7 @@
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
         <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
         <MAX_PT_IRQ_ENTRIES>128</MAX_PT_IRQ_ENTRIES>
-        <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+        <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
         <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
     </CAPACITIES>
 
diff --git a/misc/config_tools/data/tgl-rvp/sdc.xml b/misc/config_tools/data/tgl-rvp/sdc.xml
index b9c105ee8..2eee3675c 100644
--- a/misc/config_tools/data/tgl-rvp/sdc.xml
+++ b/misc/config_tools/data/tgl-rvp/sdc.xml
@@ -55,7 +55,7 @@
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
         <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
         <MAX_PT_IRQ_ENTRIES>128</MAX_PT_IRQ_ENTRIES>
-        <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+        <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
         <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
     </CAPACITIES>
 
diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid.xml b/misc/config_tools/data/whl-ipc-i5/hybrid.xml
index ed5775df1..67b74798b 100644
--- a/misc/config_tools/data/whl-ipc-i5/hybrid.xml
+++ b/misc/config_tools/data/whl-ipc-i5/hybrid.xml
@@ -47,7 +47,7 @@
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
         <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
         <MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
-        <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+        <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
         <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
     </CAPACITIES>
 
diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml b/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml
index c3231bb76..e0fc2c704 100644
--- a/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml
+++ b/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml
@@ -47,7 +47,7 @@
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
         <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
         <MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
-        <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+        <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
         <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
     </CAPACITIES>
 
diff --git a/misc/config_tools/data/whl-ipc-i5/industry.xml b/misc/config_tools/data/whl-ipc-i5/industry.xml
index ab25a9c69..052c73bf3 100644
--- a/misc/config_tools/data/whl-ipc-i5/industry.xml
+++ b/misc/config_tools/data/whl-ipc-i5/industry.xml
@@ -47,7 +47,7 @@
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
         <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
         <MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
-        <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+        <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
         <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
     </CAPACITIES>
 
diff --git a/misc/config_tools/data/whl-ipc-i5/logical_partition.xml b/misc/config_tools/data/whl-ipc-i5/logical_partition.xml
index 4ca0cab15..ec075a09c 100644
--- a/misc/config_tools/data/whl-ipc-i5/logical_partition.xml
+++ b/misc/config_tools/data/whl-ipc-i5/logical_partition.xml
@@ -47,7 +47,7 @@
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
         <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
         <MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
-        <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+        <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
         <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
     </CAPACITIES>
 
diff --git a/misc/config_tools/data/whl-ipc-i5/sdc.xml b/misc/config_tools/data/whl-ipc-i5/sdc.xml
index 4b06ba7f6..76af96a50 100644
--- a/misc/config_tools/data/whl-ipc-i5/sdc.xml
+++ b/misc/config_tools/data/whl-ipc-i5/sdc.xml
@@ -47,7 +47,7 @@
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
         <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
         <MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
-        <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+        <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
         <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
     </CAPACITIES>
 
diff --git a/misc/config_tools/data/whl-ipc-i7/hybrid.xml b/misc/config_tools/data/whl-ipc-i7/hybrid.xml
index 5503c2460..8edff603f 100644
--- a/misc/config_tools/data/whl-ipc-i7/hybrid.xml
+++ b/misc/config_tools/data/whl-ipc-i7/hybrid.xml
@@ -47,7 +47,7 @@
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
         <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
         <MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
-        <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+        <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
         <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
     </CAPACITIES>
 
diff --git a/misc/config_tools/data/whl-ipc-i7/hybrid_rt.xml b/misc/config_tools/data/whl-ipc-i7/hybrid_rt.xml
index dad0d7643..080db08b6 100644
--- a/misc/config_tools/data/whl-ipc-i7/hybrid_rt.xml
+++ b/misc/config_tools/data/whl-ipc-i7/hybrid_rt.xml
@@ -47,7 +47,7 @@
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
         <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
         <MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
-        <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+        <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
         <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
     </CAPACITIES>
 
diff --git a/misc/config_tools/data/whl-ipc-i7/industry.xml b/misc/config_tools/data/whl-ipc-i7/industry.xml
index d7214fc48..f20e1a6ec 100644
--- a/misc/config_tools/data/whl-ipc-i7/industry.xml
+++ b/misc/config_tools/data/whl-ipc-i7/industry.xml
@@ -47,7 +47,7 @@
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
         <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
         <MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
-        <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+        <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
         <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
     </CAPACITIES>
 
diff --git a/misc/config_tools/data/whl-ipc-i7/logical_partition.xml b/misc/config_tools/data/whl-ipc-i7/logical_partition.xml
index 725287bd3..4a1f6fdfe 100644
--- a/misc/config_tools/data/whl-ipc-i7/logical_partition.xml
+++ b/misc/config_tools/data/whl-ipc-i7/logical_partition.xml
@@ -47,7 +47,7 @@
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
         <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
         <MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
-        <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+        <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
         <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
     </CAPACITIES>
 
diff --git a/misc/config_tools/data/whl-ipc-i7/sdc.xml b/misc/config_tools/data/whl-ipc-i7/sdc.xml
index 1f7065c5a..512a8b267 100644
--- a/misc/config_tools/data/whl-ipc-i7/sdc.xml
+++ b/misc/config_tools/data/whl-ipc-i7/sdc.xml
@@ -51,7 +51,7 @@
         <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
         <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
         <MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
-        <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
+        <MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
         <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
     </CAPACITIES>