diff --git a/misc/vm_configs/xmls/config-xmls/apl-mrb/hybrid.xml b/misc/vm_configs/xmls/config-xmls/apl-mrb/hybrid.xml
index cffad6acd..beafa2f5e 100644
--- a/misc/vm_configs/xmls/config-xmls/apl-mrb/hybrid.xml
+++ b/misc/vm_configs/xmls/config-xmls/apl-mrb/hybrid.xml
@@ -128,7 +128,9 @@
         <pcpu_id>1</pcpu_id>
         <pcpu_id>2</pcpu_id>
     </cpu_affinity>
-    <clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+    <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+        <vcpu_clos>0</vcpu_clos>
+        <vcpu_clos>0</vcpu_clos>
         <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
diff --git a/misc/vm_configs/xmls/config-xmls/apl-up2/hybrid.xml b/misc/vm_configs/xmls/config-xmls/apl-up2/hybrid.xml
index 84d6abdaa..93239c406 100644
--- a/misc/vm_configs/xmls/config-xmls/apl-up2/hybrid.xml
+++ b/misc/vm_configs/xmls/config-xmls/apl-up2/hybrid.xml
@@ -128,7 +128,9 @@
         <pcpu_id>1</pcpu_id>
         <pcpu_id>2</pcpu_id>
     </cpu_affinity>
-    <clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+    <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+        <vcpu_clos>0</vcpu_clos>
+        <vcpu_clos>0</vcpu_clos>
         <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
diff --git a/misc/vm_configs/xmls/config-xmls/cfl-k700-i7/hybrid_rt.xml b/misc/vm_configs/xmls/config-xmls/cfl-k700-i7/hybrid_rt.xml
index a620908ec..6b334fc70 100644
--- a/misc/vm_configs/xmls/config-xmls/cfl-k700-i7/hybrid_rt.xml
+++ b/misc/vm_configs/xmls/config-xmls/cfl-k700-i7/hybrid_rt.xml
@@ -125,7 +125,7 @@
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
         <guest_flag>0</guest_flag>
     </guest_flags>
-    <clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+    <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
         <vcpu_clos>0</vcpu_clos>
         <vcpu_clos>0</vcpu_clos>
         <vcpu_clos>0</vcpu_clos>
diff --git a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid.xml b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid.xml
index cde466da7..73465d8fc 100644
--- a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid.xml
+++ b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid.xml
@@ -76,9 +76,6 @@
         <cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
             <pcpu_id>3</pcpu_id>
         </cpu_affinity>
-        <mmio_resources desc="MMIO resources.">
-            <p2sb>n</p2sb>
-        </mmio_resources>
         <pt_intx desc="pt intx mapping.">
         </pt_intx>
         <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
@@ -128,6 +125,7 @@
         </pci_devs>
         <mmio_resources desc="mmio devices list to passthrough">
             <TPM2 desc="TPM2 device">n</TPM2>
+            <p2sb>n</p2sb>
         </mmio_resources>
     </vm>
     <vm id="1">
@@ -141,7 +139,9 @@
             <pcpu_id>1</pcpu_id>
             <pcpu_id>2</pcpu_id>
         </cpu_affinity>
-        <clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+        <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+            <vcpu_clos>0</vcpu_clos>
+            <vcpu_clos>0</vcpu_clos>
             <vcpu_clos>0</vcpu_clos>
         </clos>
         <memory>
diff --git a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid_rt.xml b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid_rt.xml
index 0500d6e0b..fa28e0925 100644
--- a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid_rt.xml
+++ b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid_rt.xml
@@ -81,6 +81,7 @@
         </cpu_affinity>
         <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
             <vcpu_clos>0</vcpu_clos>
+            <vcpu_clos>0</vcpu_clos>
         </clos>
         <epc_section configurable="0" desc="epc section">
             <base desc="SGX EPC section base, must be page aligned">0</base>
@@ -137,7 +138,8 @@
             <pcpu_id>0</pcpu_id>
             <pcpu_id>1</pcpu_id>
         </cpu_affinity>
-        <clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+        <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+            <vcpu_clos>0</vcpu_clos>
             <vcpu_clos>0</vcpu_clos>
         </clos>
         <memory>
diff --git a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid_rt_fusa.xml b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid_rt_fusa.xml
index c3417d06f..5bd4ee0bf 100644
--- a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid_rt_fusa.xml
+++ b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid_rt_fusa.xml
@@ -80,6 +80,7 @@
         </cpu_affinity>
         <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
             <vcpu_clos>0</vcpu_clos>
+            <vcpu_clos>0</vcpu_clos>
         </clos>
         <epc_section configurable="0" desc="epc section">
             <base desc="SGX EPC section base, must be page aligned">0</base>
@@ -140,7 +141,8 @@
             <pcpu_id>0</pcpu_id>
             <pcpu_id>1</pcpu_id>
         </cpu_affinity>
-        <clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+        <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+            <vcpu_clos>0</vcpu_clos>
             <vcpu_clos>0</vcpu_clos>
         </clos>
         <memory>
diff --git a/misc/vm_configs/xmls/config-xmls/generic/hybrid.xml b/misc/vm_configs/xmls/config-xmls/generic/hybrid.xml
index 3e8c2c9b2..e29f06cc9 100644
--- a/misc/vm_configs/xmls/config-xmls/generic/hybrid.xml
+++ b/misc/vm_configs/xmls/config-xmls/generic/hybrid.xml
@@ -126,7 +126,9 @@
         <pcpu_id>1</pcpu_id>
         <pcpu_id>2</pcpu_id>
     </cpu_affinity>
-    <clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+    <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+        <vcpu_clos>0</vcpu_clos>
+        <vcpu_clos>0</vcpu_clos>
         <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
diff --git a/misc/vm_configs/xmls/config-xmls/generic/hybrid_rt.xml b/misc/vm_configs/xmls/config-xmls/generic/hybrid_rt.xml
index 8371ba243..302c5d523 100644
--- a/misc/vm_configs/xmls/config-xmls/generic/hybrid_rt.xml
+++ b/misc/vm_configs/xmls/config-xmls/generic/hybrid_rt.xml
@@ -126,7 +126,8 @@
         <pcpu_id>0</pcpu_id>
         <pcpu_id>1</pcpu_id>
     </cpu_affinity>
-    <clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+    <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+        <vcpu_clos>0</vcpu_clos>
         <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
diff --git a/misc/vm_configs/xmls/config-xmls/nuc6cayh/hybrid.xml b/misc/vm_configs/xmls/config-xmls/nuc6cayh/hybrid.xml
index cd9c4656f..3948f2c5a 100644
--- a/misc/vm_configs/xmls/config-xmls/nuc6cayh/hybrid.xml
+++ b/misc/vm_configs/xmls/config-xmls/nuc6cayh/hybrid.xml
@@ -128,7 +128,9 @@
         <pcpu_id>1</pcpu_id>
         <pcpu_id>2</pcpu_id>
     </cpu_affinity>
-    <clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+    <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+        <vcpu_clos>0</vcpu_clos>
+        <vcpu_clos>0</vcpu_clos>
         <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
diff --git a/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/hybrid.xml b/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/hybrid.xml
index ce6d13064..c3425e076 100644
--- a/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/hybrid.xml
+++ b/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/hybrid.xml
@@ -124,7 +124,9 @@
         <pcpu_id>1</pcpu_id>
         <pcpu_id>2</pcpu_id>
     </cpu_affinity>
-    <clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+    <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+        <vcpu_clos>0</vcpu_clos>
+        <vcpu_clos>0</vcpu_clos>
         <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
diff --git a/misc/vm_configs/xmls/config-xmls/qemu/sdc.xml b/misc/vm_configs/xmls/config-xmls/qemu/sdc.xml
index 7750615bc..39cf15e94 100644
--- a/misc/vm_configs/xmls/config-xmls/qemu/sdc.xml
+++ b/misc/vm_configs/xmls/config-xmls/qemu/sdc.xml
@@ -114,7 +114,7 @@
     <cpu_affinity desc="List of pCPU: the guest VM is allowed to create vCPU from all or a subset of this list.">
         <pcpu_id>1</pcpu_id>
     </cpu_affinity>
-    <clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+    <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
         <vcpu_clos>0</vcpu_clos>
     </clos>
     <epc_section configurable="0" desc="epc section">
diff --git a/misc/vm_configs/xmls/config-xmls/template/SOS_VM.xml b/misc/vm_configs/xmls/config-xmls/template/SOS_VM.xml
index ef6618d79..b927d8cec 100644
--- a/misc/vm_configs/xmls/config-xmls/template/SOS_VM.xml
+++ b/misc/vm_configs/xmls/config-xmls/template/SOS_VM.xml
@@ -8,7 +8,7 @@
     <cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
         <pcpu_id></pcpu_id>
     </cpu_affinity>
-    <clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+    <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
         <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
diff --git a/misc/vm_configs/xmls/config-xmls/tgl-rvp/hybrid.xml b/misc/vm_configs/xmls/config-xmls/tgl-rvp/hybrid.xml
index c354b0e54..3d0698cf0 100644
--- a/misc/vm_configs/xmls/config-xmls/tgl-rvp/hybrid.xml
+++ b/misc/vm_configs/xmls/config-xmls/tgl-rvp/hybrid.xml
@@ -124,7 +124,9 @@
         <pcpu_id>1</pcpu_id>
         <pcpu_id>2</pcpu_id>
     </cpu_affinity>
-    <clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+    <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+        <vcpu_clos>0</vcpu_clos>
+        <vcpu_clos>0</vcpu_clos>
         <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
diff --git a/misc/vm_configs/xmls/config-xmls/tgl-rvp/hybrid_rt.xml b/misc/vm_configs/xmls/config-xmls/tgl-rvp/hybrid_rt.xml
index 4b04807b9..d24b8543b 100644
--- a/misc/vm_configs/xmls/config-xmls/tgl-rvp/hybrid_rt.xml
+++ b/misc/vm_configs/xmls/config-xmls/tgl-rvp/hybrid_rt.xml
@@ -71,6 +71,7 @@
     </cpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
         <vcpu_clos>0</vcpu_clos>
+        <vcpu_clos>0</vcpu_clos>
     </clos>
     <epc_section configurable="0" desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
@@ -126,7 +127,8 @@
     <guest_flags desc="Select all applicable flags for the VM" multiselect="true">
         <guest_flag>0</guest_flag>
     </guest_flags>
-    <clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+    <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+        <vcpu_clos>0</vcpu_clos>
         <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
diff --git a/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/hybrid.xml b/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/hybrid.xml
index abda08423..c19681d0c 100644
--- a/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/hybrid.xml
+++ b/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/hybrid.xml
@@ -124,7 +124,9 @@
         <pcpu_id>1</pcpu_id>
         <pcpu_id>2</pcpu_id>
     </cpu_affinity>
-    <clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+    <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+        <vcpu_clos>0</vcpu_clos>
+        <vcpu_clos>0</vcpu_clos>
         <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
diff --git a/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/hybrid_rt.xml b/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/hybrid_rt.xml
index e2b66628a..ffc87dc20 100644
--- a/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/hybrid_rt.xml
+++ b/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/hybrid_rt.xml
@@ -68,6 +68,7 @@
     </cpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
         <vcpu_clos>0</vcpu_clos>
+        <vcpu_clos>0</vcpu_clos>
     </clos>
     <epc_section configurable="0" desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
@@ -127,7 +128,8 @@
         <pcpu_id>0</pcpu_id>
         <pcpu_id>1</pcpu_id>
     </cpu_affinity>
-    <clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+    <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+        <vcpu_clos>0</vcpu_clos>
         <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
diff --git a/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/hybrid.xml b/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/hybrid.xml
index c2677226e..c47f1f91c 100644
--- a/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/hybrid.xml
+++ b/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/hybrid.xml
@@ -124,7 +124,9 @@
         <pcpu_id>1</pcpu_id>
         <pcpu_id>2</pcpu_id>
     </cpu_affinity>
-    <clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+    <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+        <vcpu_clos>0</vcpu_clos>
+        <vcpu_clos>0</vcpu_clos>
         <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>
diff --git a/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/hybrid_rt.xml b/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/hybrid_rt.xml
index f72fbd57f..31d8d4d29 100644
--- a/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/hybrid_rt.xml
+++ b/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/hybrid_rt.xml
@@ -68,6 +68,7 @@
     </cpu_affinity>
     <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
         <vcpu_clos>0</vcpu_clos>
+        <vcpu_clos>0</vcpu_clos>
     </clos>
     <epc_section configurable="0" desc="epc section">
         <base desc="SGX EPC section base, must be page aligned">0</base>
@@ -127,7 +128,8 @@
         <pcpu_id>0</pcpu_id>
         <pcpu_id>1</pcpu_id>
     </cpu_affinity>
-    <clos configurable="0" desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+    <clos desc="Class of Service for Cache Allocation Technology. Please refer SDM 17.19.2 for details and use with caution.">
+        <vcpu_clos>0</vcpu_clos>
         <vcpu_clos>0</vcpu_clos>
     </clos>
     <memory>