diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid.xml b/misc/config_tools/data/cfl-k700-i7/hybrid.xml
index eb8d908dc..f00f4f60d 100644
--- a/misc/config_tools/data/cfl-k700-i7/hybrid.xml
+++ b/misc/config_tools/data/cfl-k700-i7/hybrid.xml
@@ -27,7 +27,6 @@
         <CLOS_MASK>0xfffff</CLOS_MASK>
         <CLOS_MASK>0xfffff</CLOS_MASK>
       </RDT>
-      <NVMX_ENABLED>n</NVMX_ENABLED>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
@@ -57,9 +56,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>PRE_LAUNCHED_VM</load_order>
     <name>SAFETY_VM0</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>3</pcpu_id>
     </cpu_affinity>
@@ -116,9 +112,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>SERVICE_VM</load_order>
     <name>ACRN_Service_VM</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>1</pcpu_id>
@@ -169,9 +162,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM1</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>2</pcpu_id>
     </cpu_affinity>
@@ -208,9 +198,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM2</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>2</pcpu_id>
     </cpu_affinity>
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 27a17750c..8aee95527 100644
--- a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
+++ b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
@@ -19,7 +19,6 @@
         <CDP_ENABLED>n</CDP_ENABLED>
         <VCAT_ENABLED>n</VCAT_ENABLED>
       </RDT>
-      <NVMX_ENABLED>n</NVMX_ENABLED>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
@@ -63,10 +62,7 @@
     <vm_type>RTVM</vm_type>
     <load_order>PRE_LAUNCHED_VM</load_order>
     <name>PRE_RT_VM0</name>
-    <guest_flags>
-      <guest_flag>GUEST_FLAG_LAPIC_PASSTHROUGH</guest_flag>
-      <guest_flag>GUEST_FLAG_RT</guest_flag>
-    </guest_flags>
+    <lapic_passthrough>y</lapic_passthrough>
     <cpu_affinity>
       <pcpu_id>6</pcpu_id>
       <pcpu_id>7</pcpu_id>
@@ -127,9 +123,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>SERVICE_VM</load_order>
     <name>ACRN_Service_VM</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <clos>
       <vcpu_clos>0</vcpu_clos>
       <vcpu_clos>0</vcpu_clos>
@@ -184,9 +177,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM1</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>1</pcpu_id>
       <pcpu_id>2</pcpu_id>
@@ -227,9 +217,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM2</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>4</pcpu_id>
       <pcpu_id>5</pcpu_id>
diff --git a/misc/config_tools/data/cfl-k700-i7/partitioned.xml b/misc/config_tools/data/cfl-k700-i7/partitioned.xml
index 83e419474..01e306d39 100644
--- a/misc/config_tools/data/cfl-k700-i7/partitioned.xml
+++ b/misc/config_tools/data/cfl-k700-i7/partitioned.xml
@@ -27,7 +27,6 @@
         <CLOS_MASK>0xfffff</CLOS_MASK>
         <CLOS_MASK>0xfffff</CLOS_MASK>
       </RDT>
-      <NVMX_ENABLED>n</NVMX_ENABLED>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
@@ -57,9 +56,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>PRE_LAUNCHED_VM</load_order>
     <name>PRE_STD_VM0</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>2</pcpu_id>
@@ -119,9 +115,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>PRE_LAUNCHED_VM</load_order>
     <name>PRE_STD_VM1</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>1</pcpu_id>
       <pcpu_id>3</pcpu_id>
diff --git a/misc/config_tools/data/cfl-k700-i7/shared.xml b/misc/config_tools/data/cfl-k700-i7/shared.xml
index 6988f91e6..952188c9c 100644
--- a/misc/config_tools/data/cfl-k700-i7/shared.xml
+++ b/misc/config_tools/data/cfl-k700-i7/shared.xml
@@ -19,7 +19,6 @@
         <CDP_ENABLED>n</CDP_ENABLED>
         <VCAT_ENABLED>n</VCAT_ENABLED>
       </RDT>
-      <NVMX_ENABLED>n</NVMX_ENABLED>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
@@ -50,9 +49,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>SERVICE_VM</load_order>
     <name>ACRN_Service_VM</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <clos>
       <vcpu_clos>0</vcpu_clos>
     </clos>
@@ -96,9 +92,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM1</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>1</pcpu_id>
@@ -136,9 +129,6 @@
     <vm_type>RTVM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_RT_VM1</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>2</pcpu_id>
       <pcpu_id>3</pcpu_id>
@@ -177,9 +167,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM2</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>1</pcpu_id>
@@ -218,9 +205,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM3</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>1</pcpu_id>
@@ -259,9 +243,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM4</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>1</pcpu_id>
@@ -300,9 +281,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM5</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>1</pcpu_id>
diff --git a/misc/config_tools/data/generic_board/hybrid.xml b/misc/config_tools/data/generic_board/hybrid.xml
index 2b092bf44..a74b67833 100644
--- a/misc/config_tools/data/generic_board/hybrid.xml
+++ b/misc/config_tools/data/generic_board/hybrid.xml
@@ -27,7 +27,6 @@
         <CLOS_MASK>0xfffff</CLOS_MASK>
         <CLOS_MASK>0xfffff</CLOS_MASK>
       </RDT>
-      <NVMX_ENABLED>n</NVMX_ENABLED>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
@@ -57,9 +56,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>PRE_LAUNCHED_VM</load_order>
     <name>SAFETY_VM0</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>3</pcpu_id>
     </cpu_affinity>
@@ -116,9 +112,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>SERVICE_VM</load_order>
     <name>ACRN_Service_VM</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>1</pcpu_id>
@@ -168,9 +161,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM1</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>2</pcpu_id>
     </cpu_affinity>
@@ -207,9 +197,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM2</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>2</pcpu_id>
     </cpu_affinity>
diff --git a/misc/config_tools/data/generic_board/hybrid_rt.xml b/misc/config_tools/data/generic_board/hybrid_rt.xml
index 5ae925de5..db73d9eed 100644
--- a/misc/config_tools/data/generic_board/hybrid_rt.xml
+++ b/misc/config_tools/data/generic_board/hybrid_rt.xml
@@ -32,7 +32,6 @@
         <CLOS_MASK>0xfff</CLOS_MASK>
         <CLOS_MASK>0xfff</CLOS_MASK>
       </RDT>
-      <NVMX_ENABLED>n</NVMX_ENABLED>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
@@ -76,10 +75,7 @@
     <vm_type>RTVM</vm_type>
     <load_order>PRE_LAUNCHED_VM</load_order>
     <name>PRE_RT_VM0</name>
-    <guest_flags>
-      <guest_flag>GUEST_FLAG_LAPIC_PASSTHROUGH</guest_flag>
-      <guest_flag>GUEST_FLAG_RT</guest_flag>
-    </guest_flags>
+    <lapic_passthrough>y</lapic_passthrough>
     <cpu_affinity>
       <pcpu_id>2</pcpu_id>
       <pcpu_id>3</pcpu_id>
@@ -137,9 +133,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>SERVICE_VM</load_order>
     <name>ACRN_Service_VM</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>1</pcpu_id>
@@ -187,9 +180,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM1</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>1</pcpu_id>
@@ -228,9 +218,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM2</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>1</pcpu_id>
     </cpu_affinity>
diff --git a/misc/config_tools/data/generic_board/partitioned.xml b/misc/config_tools/data/generic_board/partitioned.xml
index 6ea32dc86..2f612ef97 100644
--- a/misc/config_tools/data/generic_board/partitioned.xml
+++ b/misc/config_tools/data/generic_board/partitioned.xml
@@ -27,7 +27,6 @@
         <CLOS_MASK>0xfffff</CLOS_MASK>
         <CLOS_MASK>0xfffff</CLOS_MASK>
       </RDT>
-      <NVMX_ENABLED>n</NVMX_ENABLED>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
@@ -57,9 +56,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>PRE_LAUNCHED_VM</load_order>
     <name>PRE_STD_VM0</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>2</pcpu_id>
@@ -119,9 +115,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>PRE_LAUNCHED_VM</load_order>
     <name>PRE_STD_VM1</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>1</pcpu_id>
       <pcpu_id>3</pcpu_id>
diff --git a/misc/config_tools/data/generic_board/shared.xml b/misc/config_tools/data/generic_board/shared.xml
index 2670d001d..60a04b8be 100644
--- a/misc/config_tools/data/generic_board/shared.xml
+++ b/misc/config_tools/data/generic_board/shared.xml
@@ -27,7 +27,6 @@
         <CLOS_MASK>0xfffff</CLOS_MASK>
         <CLOS_MASK>0xfffff</CLOS_MASK>
       </RDT>
-      <NVMX_ENABLED>n</NVMX_ENABLED>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
@@ -57,9 +56,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>SERVICE_VM</load_order>
     <name>ACRN_Service_VM</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <clos>
       <vcpu_clos>0</vcpu_clos>
     </clos>
@@ -103,9 +99,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM1</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>1</pcpu_id>
@@ -144,10 +137,7 @@
     <vm_type>RTVM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_RT_VM1</name>
-    <guest_flags>
-      <guest_flag>GUEST_FLAG_LAPIC_PASSTHROUGH</guest_flag>
-      <guest_flag>GUEST_FLAG_RT</guest_flag>
-    </guest_flags>
+    <lapic_passthrough>y</lapic_passthrough>
     <cpu_affinity>
       <pcpu_id>2</pcpu_id>
       <pcpu_id>3</pcpu_id>
@@ -186,9 +176,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM2</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>1</pcpu_id>
@@ -227,9 +214,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM3</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>1</pcpu_id>
@@ -268,9 +252,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM4</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>1</pcpu_id>
@@ -309,9 +290,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM5</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>1</pcpu_id>
diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid.xml b/misc/config_tools/data/nuc11tnbi5/hybrid.xml
index 13b390313..dc301a21c 100644
--- a/misc/config_tools/data/nuc11tnbi5/hybrid.xml
+++ b/misc/config_tools/data/nuc11tnbi5/hybrid.xml
@@ -27,7 +27,6 @@
         <CLOS_MASK>0xfffff</CLOS_MASK>
         <CLOS_MASK>0xfffff</CLOS_MASK>
       </RDT>
-      <NVMX_ENABLED>n</NVMX_ENABLED>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
@@ -57,9 +56,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>PRE_LAUNCHED_VM</load_order>
     <name>SAFETY_VM0</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>3</pcpu_id>
     </cpu_affinity>
@@ -116,9 +112,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>SERVICE_VM</load_order>
     <name>ACRN_Service_VM</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>1</pcpu_id>
@@ -168,9 +161,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM1</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>2</pcpu_id>
     </cpu_affinity>
@@ -207,9 +197,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM2</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>2</pcpu_id>
     </cpu_affinity>
diff --git a/misc/config_tools/data/nuc11tnbi5/partitioned.xml b/misc/config_tools/data/nuc11tnbi5/partitioned.xml
index 69890ee1f..ac5978b90 100644
--- a/misc/config_tools/data/nuc11tnbi5/partitioned.xml
+++ b/misc/config_tools/data/nuc11tnbi5/partitioned.xml
@@ -27,7 +27,6 @@
         <CLOS_MASK>0xfffff</CLOS_MASK>
         <CLOS_MASK>0xfffff</CLOS_MASK>
       </RDT>
-      <NVMX_ENABLED>n</NVMX_ENABLED>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
@@ -57,9 +56,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>PRE_LAUNCHED_VM</load_order>
     <name>PRE_STD_VM0</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>2</pcpu_id>
@@ -119,9 +115,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>PRE_LAUNCHED_VM</load_order>
     <name>PRE_STD_VM1</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>1</pcpu_id>
       <pcpu_id>3</pcpu_id>
diff --git a/misc/config_tools/data/nuc11tnbi5/shared.xml b/misc/config_tools/data/nuc11tnbi5/shared.xml
index d3c01e5c2..7b2c60b42 100644
--- a/misc/config_tools/data/nuc11tnbi5/shared.xml
+++ b/misc/config_tools/data/nuc11tnbi5/shared.xml
@@ -27,7 +27,6 @@
         <CLOS_MASK>0xfffff</CLOS_MASK>
         <CLOS_MASK>0xfffff</CLOS_MASK>
       </RDT>
-      <NVMX_ENABLED>n</NVMX_ENABLED>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
@@ -57,9 +56,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>SERVICE_VM</load_order>
     <name>ACRN_Service_VM</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <clos>
       <vcpu_clos>0</vcpu_clos>
     </clos>
@@ -103,9 +99,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM1</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>1</pcpu_id>
@@ -144,10 +137,7 @@
     <vm_type>RTVM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_RT_VM1</name>
-    <guest_flags>
-      <guest_flag>GUEST_FLAG_LAPIC_PASSTHROUGH</guest_flag>
-      <guest_flag>GUEST_FLAG_RT</guest_flag>
-    </guest_flags>
+    <lapic_passthrough>y</lapic_passthrough>
     <cpu_affinity>
       <pcpu_id>2</pcpu_id>
       <pcpu_id>3</pcpu_id>
@@ -186,9 +176,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM2</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>1</pcpu_id>
@@ -227,9 +214,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM3</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>1</pcpu_id>
@@ -268,9 +252,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM4</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>1</pcpu_id>
@@ -309,9 +290,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM5</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>1</pcpu_id>
diff --git a/misc/config_tools/data/qemu/shared.xml b/misc/config_tools/data/qemu/shared.xml
index 9ef5b10d0..731e65f8b 100644
--- a/misc/config_tools/data/qemu/shared.xml
+++ b/misc/config_tools/data/qemu/shared.xml
@@ -19,7 +19,6 @@
         <CDP_ENABLED>n</CDP_ENABLED>
         <VCAT_ENABLED>n</VCAT_ENABLED>
       </RDT>
-      <NVMX_ENABLED>n</NVMX_ENABLED>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
@@ -50,9 +49,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>SERVICE_VM</load_order>
     <name>ACRN_Service_VM</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <clos>
       <vcpu_clos>0</vcpu_clos>
     </clos>
@@ -95,9 +91,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM1</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>1</pcpu_id>
     </cpu_affinity>
diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml
index 501e7928a..60ee3115f 100644
--- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml
+++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml
@@ -27,7 +27,6 @@
         <CLOS_MASK>0xfffff</CLOS_MASK>
         <CLOS_MASK>0xfffff</CLOS_MASK>
       </RDT>
-      <NVMX_ENABLED>n</NVMX_ENABLED>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
@@ -57,9 +56,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>PRE_LAUNCHED_VM</load_order>
     <name>SAFETY_VM0</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>3</pcpu_id>
     </cpu_affinity>
@@ -116,9 +112,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>SERVICE_VM</load_order>
     <name>ACRN_Service_VM</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>1</pcpu_id>
@@ -169,9 +162,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM1</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>2</pcpu_id>
     </cpu_affinity>
@@ -208,9 +198,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM2</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>2</pcpu_id>
     </cpu_affinity>
diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml
index 4ebf47755..f12d47021 100644
--- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml
+++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml
@@ -27,7 +27,6 @@
         <CLOS_MASK>0xfffff</CLOS_MASK>
         <CLOS_MASK>0xfffff</CLOS_MASK>
       </RDT>
-      <NVMX_ENABLED>n</NVMX_ENABLED>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
@@ -57,9 +56,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>PRE_LAUNCHED_VM</load_order>
     <name>PRE_STD_VM0</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>2</pcpu_id>
@@ -119,9 +115,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>PRE_LAUNCHED_VM</load_order>
     <name>PRE_STD_VM1</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>1</pcpu_id>
       <pcpu_id>3</pcpu_id>
diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared.xml
index dfacc1ae1..38a2ef472 100644
--- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared.xml
+++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared.xml
@@ -27,7 +27,6 @@
         <CLOS_MASK>0xfffff</CLOS_MASK>
         <CLOS_MASK>0xfffff</CLOS_MASK>
       </RDT>
-      <NVMX_ENABLED>n</NVMX_ENABLED>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
@@ -57,9 +56,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>SERVICE_VM</load_order>
     <name>ACRN_Service_VM</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <clos>
       <vcpu_clos>0</vcpu_clos>
     </clos>
@@ -111,9 +107,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM1</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>1</pcpu_id>
@@ -160,10 +153,7 @@
     <vm_type>RTVM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_RT_VM1</name>
-    <guest_flags>
-      <guest_flag>GUEST_FLAG_LAPIC_PASSTHROUGH</guest_flag>
-      <guest_flag>GUEST_FLAG_RT</guest_flag>
-    </guest_flags>
+    <lapic_passthrough>y</lapic_passthrough>
     <cpu_affinity>
       <pcpu_id>2</pcpu_id>
       <pcpu_id>3</pcpu_id>
diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid.xml b/misc/config_tools/data/whl-ipc-i5/hybrid.xml
index 1840b006b..eb2aa349c 100644
--- a/misc/config_tools/data/whl-ipc-i5/hybrid.xml
+++ b/misc/config_tools/data/whl-ipc-i5/hybrid.xml
@@ -19,7 +19,6 @@
         <CDP_ENABLED>n</CDP_ENABLED>
         <VCAT_ENABLED>n</VCAT_ENABLED>
       </RDT>
-      <NVMX_ENABLED>n</NVMX_ENABLED>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
@@ -49,9 +48,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>PRE_LAUNCHED_VM</load_order>
     <name>SAFETY_VM0</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>3</pcpu_id>
     </cpu_affinity>
@@ -106,9 +102,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>SERVICE_VM</load_order>
     <name>ACRN_Service_VM</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>1</pcpu_id>
@@ -158,9 +151,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM1</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>2</pcpu_id>
     </cpu_affinity>
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 31f272f8e..b1a57f932 100644
--- a/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml
+++ b/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml
@@ -19,7 +19,6 @@
         <CDP_ENABLED>n</CDP_ENABLED>
         <VCAT_ENABLED>n</VCAT_ENABLED>
       </RDT>
-      <NVMX_ENABLED>n</NVMX_ENABLED>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
@@ -62,10 +61,7 @@
     <vm_type>RTVM</vm_type>
     <load_order>PRE_LAUNCHED_VM</load_order>
     <name>PRE_RT_VM0</name>
-    <guest_flags>
-      <guest_flag>GUEST_FLAG_LAPIC_PASSTHROUGH</guest_flag>
-      <guest_flag>GUEST_FLAG_RT</guest_flag>
-    </guest_flags>
+    <lapic_passthrough>y</lapic_passthrough>
     <cpu_affinity>
       <pcpu_id>2</pcpu_id>
       <pcpu_id>3</pcpu_id>
@@ -126,9 +122,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>SERVICE_VM</load_order>
     <name>ACRN_Service_VM</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>1</pcpu_id>
@@ -176,9 +169,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM1</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>1</pcpu_id>
@@ -217,9 +207,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM2</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>1</pcpu_id>
     </cpu_affinity>
diff --git a/misc/config_tools/data/whl-ipc-i5/partitioned.xml b/misc/config_tools/data/whl-ipc-i5/partitioned.xml
index 59e12a3f5..3ec7f85cb 100644
--- a/misc/config_tools/data/whl-ipc-i5/partitioned.xml
+++ b/misc/config_tools/data/whl-ipc-i5/partitioned.xml
@@ -19,7 +19,6 @@
         <CDP_ENABLED>n</CDP_ENABLED>
         <VCAT_ENABLED>n</VCAT_ENABLED>
       </RDT>
-      <NVMX_ENABLED>n</NVMX_ENABLED>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
@@ -49,9 +48,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>PRE_LAUNCHED_VM</load_order>
     <name>PRE_STD_VM0</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>2</pcpu_id>
@@ -112,9 +108,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>PRE_LAUNCHED_VM</load_order>
     <name>PRE_STD_VM1</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>1</pcpu_id>
       <pcpu_id>3</pcpu_id>
diff --git a/misc/config_tools/data/whl-ipc-i5/sdc.xml b/misc/config_tools/data/whl-ipc-i5/sdc.xml
index 0ac83503d..4773be527 100644
--- a/misc/config_tools/data/whl-ipc-i5/sdc.xml
+++ b/misc/config_tools/data/whl-ipc-i5/sdc.xml
@@ -19,7 +19,6 @@
         <CDP_ENABLED>n</CDP_ENABLED>
         <VCAT_ENABLED>n</VCAT_ENABLED>
       </RDT>
-      <NVMX_ENABLED>n</NVMX_ENABLED>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
@@ -49,9 +48,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>SERVICE_VM</load_order>
     <name>ACRN_Service_VM</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <clos>
       <vcpu_clos>0</vcpu_clos>
     </clos>
@@ -94,9 +90,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM1</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>1</pcpu_id>
       <pcpu_id>2</pcpu_id>
diff --git a/misc/config_tools/data/whl-ipc-i5/shared.xml b/misc/config_tools/data/whl-ipc-i5/shared.xml
index 6d30ea6fd..e2231afda 100644
--- a/misc/config_tools/data/whl-ipc-i5/shared.xml
+++ b/misc/config_tools/data/whl-ipc-i5/shared.xml
@@ -19,7 +19,6 @@
         <CDP_ENABLED>n</CDP_ENABLED>
         <VCAT_ENABLED>n</VCAT_ENABLED>
       </RDT>
-      <NVMX_ENABLED>n</NVMX_ENABLED>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
@@ -49,9 +48,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>SERVICE_VM</load_order>
     <name>ACRN_Service_VM</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <clos>
       <vcpu_clos>0</vcpu_clos>
     </clos>
@@ -95,9 +91,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM1</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>1</pcpu_id>
@@ -135,9 +128,6 @@
     <vm_type>RTVM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_RT_VM1</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>2</pcpu_id>
       <pcpu_id>3</pcpu_id>
@@ -176,9 +166,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM2</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>1</pcpu_id>
@@ -217,9 +204,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM3</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>1</pcpu_id>
@@ -258,9 +242,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM4</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>1</pcpu_id>
@@ -299,9 +280,6 @@
     <vm_type>STANDARD_VM</vm_type>
     <load_order>POST_LAUNCHED_VM</load_order>
     <name>POST_STD_VM5</name>
-    <guest_flags>
-      <guest_flag>0</guest_flag>
-    </guest_flags>
     <cpu_affinity>
       <pcpu_id>0</pcpu_id>
       <pcpu_id>1</pcpu_id>