From a130d293e13bb1474ab1b44ece9904b552bb1743 Mon Sep 17 00:00:00 2001
From: Pim van Pelt <pim@ipng.nl>
Date: Mon, 29 Sep 2025 20:48:35 +0000
Subject: [PATCH] Remove CPU configs, just use host passthrough

---
 .../hvn0.lab.ipng.ch/host0-0/root/libvirt.xml | 25 +------------------
 .../hvn0.lab.ipng.ch/host0-1/root/libvirt.xml | 25 +------------------
 .../hvn0.lab.ipng.ch/tap0-0/root/libvirt.xml  | 25 +------------------
 .../hvn0.lab.ipng.ch/vpp0-0/root/libvirt.xml  | 25 +------------------
 .../hvn0.lab.ipng.ch/vpp0-1/root/libvirt.xml  | 25 +------------------
 .../hvn0.lab.ipng.ch/vpp0-2/root/libvirt.xml  | 25 +------------------
 .../hvn0.lab.ipng.ch/vpp0-3/root/libvirt.xml  | 25 +------------------
 .../hvn1.lab.ipng.ch/host1-0/root/libvirt.xml | 25 +------------------
 .../hvn1.lab.ipng.ch/host1-1/root/libvirt.xml | 25 +------------------
 .../hvn1.lab.ipng.ch/tap1-0/root/libvirt.xml  | 25 +------------------
 .../hvn1.lab.ipng.ch/vpp1-0/root/libvirt.xml  | 25 +------------------
 .../hvn1.lab.ipng.ch/vpp1-1/root/libvirt.xml  | 25 +------------------
 .../hvn1.lab.ipng.ch/vpp1-2/root/libvirt.xml  | 25 +------------------
 .../hvn1.lab.ipng.ch/vpp1-3/root/libvirt.xml  | 25 +------------------
 .../hvn2.lab.ipng.ch/host2-0/root/libvirt.xml | 25 +------------------
 .../hvn2.lab.ipng.ch/host2-1/root/libvirt.xml | 25 +------------------
 .../hvn2.lab.ipng.ch/tap2-0/root/libvirt.xml  | 25 +------------------
 .../hvn2.lab.ipng.ch/vpp2-0/root/libvirt.xml  | 25 +------------------
 .../hvn2.lab.ipng.ch/vpp2-1/root/libvirt.xml  | 25 +------------------
 .../hvn2.lab.ipng.ch/vpp2-2/root/libvirt.xml  | 25 +------------------
 .../hvn2.lab.ipng.ch/vpp2-3/root/libvirt.xml  | 25 +------------------
 .../hvn3.lab.ipng.ch/host3-0/root/libvirt.xml | 25 +------------------
 .../hvn3.lab.ipng.ch/host3-1/root/libvirt.xml | 25 +------------------
 .../hvn3.lab.ipng.ch/tap3-0/root/libvirt.xml  | 25 +------------------
 .../hvn3.lab.ipng.ch/vpp3-0/root/libvirt.xml  | 25 +------------------
 .../hvn3.lab.ipng.ch/vpp3-1/root/libvirt.xml  | 25 +------------------
 .../hvn3.lab.ipng.ch/vpp3-2/root/libvirt.xml  | 25 +------------------
 .../hvn3.lab.ipng.ch/vpp3-3/root/libvirt.xml  | 25 +------------------
 .../hvn0.lab.ipng.ch/host0-0/root/libvirt.xml | 25 +------------------
 .../hvn0.lab.ipng.ch/host0-1/root/libvirt.xml | 25 +------------------
 .../hvn0.lab.ipng.ch/tap0-0/root/libvirt.xml  | 25 +------------------
 .../hvn0.lab.ipng.ch/vpp0-0/root/libvirt.xml  | 25 +------------------
 .../hvn0.lab.ipng.ch/vpp0-1/root/libvirt.xml  | 25 +------------------
 .../hvn0.lab.ipng.ch/vpp0-2/root/libvirt.xml  | 25 +------------------
 .../hvn0.lab.ipng.ch/vpp0-3/root/libvirt.xml  | 25 +------------------
 .../hvn1.lab.ipng.ch/host1-0/root/libvirt.xml | 25 +------------------
 .../hvn1.lab.ipng.ch/host1-1/root/libvirt.xml | 25 +------------------
 .../hvn1.lab.ipng.ch/tap1-0/root/libvirt.xml  | 25 +------------------
 .../hvn1.lab.ipng.ch/vpp1-0/root/libvirt.xml  | 25 +------------------
 .../hvn1.lab.ipng.ch/vpp1-1/root/libvirt.xml  | 25 +------------------
 .../hvn1.lab.ipng.ch/vpp1-2/root/libvirt.xml  | 25 +------------------
 .../hvn1.lab.ipng.ch/vpp1-3/root/libvirt.xml  | 25 +------------------
 .../hvn2.lab.ipng.ch/host2-0/root/libvirt.xml | 25 +------------------
 .../hvn2.lab.ipng.ch/host2-1/root/libvirt.xml | 25 +------------------
 .../hvn2.lab.ipng.ch/tap2-0/root/libvirt.xml  | 25 +------------------
 .../hvn2.lab.ipng.ch/vpp2-0/root/libvirt.xml  | 25 +------------------
 .../hvn2.lab.ipng.ch/vpp2-1/root/libvirt.xml  | 25 +------------------
 .../hvn2.lab.ipng.ch/vpp2-2/root/libvirt.xml  | 25 +------------------
 .../hvn2.lab.ipng.ch/vpp2-3/root/libvirt.xml  | 25 +------------------
 .../hvn3.lab.ipng.ch/host3-0/root/libvirt.xml | 25 +------------------
 .../hvn3.lab.ipng.ch/host3-1/root/libvirt.xml | 25 +------------------
 .../hvn3.lab.ipng.ch/tap3-0/root/libvirt.xml  | 25 +------------------
 .../hvn3.lab.ipng.ch/vpp3-0/root/libvirt.xml  | 25 +------------------
 .../hvn3.lab.ipng.ch/vpp3-1/root/libvirt.xml  | 25 +------------------
 .../hvn3.lab.ipng.ch/vpp3-2/root/libvirt.xml  | 25 +------------------
 .../hvn3.lab.ipng.ch/vpp3-3/root/libvirt.xml  | 25 +------------------
 overlays/_common/common/root/libvirt.xml.j2   | 25 +------------------
 57 files changed, 57 insertions(+), 1368 deletions(-)

diff --git a/build/bird/hvn0.lab.ipng.ch/host0-0/root/libvirt.xml b/build/bird/hvn0.lab.ipng.ch/host0-0/root/libvirt.xml
index 5cb8ae2..8a2c970 100644
--- a/build/bird/hvn0.lab.ipng.ch/host0-0/root/libvirt.xml
+++ b/build/bird/hvn0.lab.ipng.ch/host0-0/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/bird/hvn0.lab.ipng.ch/host0-1/root/libvirt.xml b/build/bird/hvn0.lab.ipng.ch/host0-1/root/libvirt.xml
index 464fc80..e727c43 100644
--- a/build/bird/hvn0.lab.ipng.ch/host0-1/root/libvirt.xml
+++ b/build/bird/hvn0.lab.ipng.ch/host0-1/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/bird/hvn0.lab.ipng.ch/tap0-0/root/libvirt.xml b/build/bird/hvn0.lab.ipng.ch/tap0-0/root/libvirt.xml
index 0434ed5..3e81e3d 100644
--- a/build/bird/hvn0.lab.ipng.ch/tap0-0/root/libvirt.xml
+++ b/build/bird/hvn0.lab.ipng.ch/tap0-0/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-0/root/libvirt.xml b/build/bird/hvn0.lab.ipng.ch/vpp0-0/root/libvirt.xml
index 5054db2..a099dc2 100644
--- a/build/bird/hvn0.lab.ipng.ch/vpp0-0/root/libvirt.xml
+++ b/build/bird/hvn0.lab.ipng.ch/vpp0-0/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-1/root/libvirt.xml b/build/bird/hvn0.lab.ipng.ch/vpp0-1/root/libvirt.xml
index d2ae07e..0c205c5 100644
--- a/build/bird/hvn0.lab.ipng.ch/vpp0-1/root/libvirt.xml
+++ b/build/bird/hvn0.lab.ipng.ch/vpp0-1/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-2/root/libvirt.xml b/build/bird/hvn0.lab.ipng.ch/vpp0-2/root/libvirt.xml
index 7161906..d3d09bc 100644
--- a/build/bird/hvn0.lab.ipng.ch/vpp0-2/root/libvirt.xml
+++ b/build/bird/hvn0.lab.ipng.ch/vpp0-2/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-3/root/libvirt.xml b/build/bird/hvn0.lab.ipng.ch/vpp0-3/root/libvirt.xml
index dcb3219..34f12f6 100644
--- a/build/bird/hvn0.lab.ipng.ch/vpp0-3/root/libvirt.xml
+++ b/build/bird/hvn0.lab.ipng.ch/vpp0-3/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/bird/hvn1.lab.ipng.ch/host1-0/root/libvirt.xml b/build/bird/hvn1.lab.ipng.ch/host1-0/root/libvirt.xml
index b72b6c3..156e65f 100644
--- a/build/bird/hvn1.lab.ipng.ch/host1-0/root/libvirt.xml
+++ b/build/bird/hvn1.lab.ipng.ch/host1-0/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/bird/hvn1.lab.ipng.ch/host1-1/root/libvirt.xml b/build/bird/hvn1.lab.ipng.ch/host1-1/root/libvirt.xml
index 09679a6..684fe04 100644
--- a/build/bird/hvn1.lab.ipng.ch/host1-1/root/libvirt.xml
+++ b/build/bird/hvn1.lab.ipng.ch/host1-1/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/bird/hvn1.lab.ipng.ch/tap1-0/root/libvirt.xml b/build/bird/hvn1.lab.ipng.ch/tap1-0/root/libvirt.xml
index 7f05d64..37c416e 100644
--- a/build/bird/hvn1.lab.ipng.ch/tap1-0/root/libvirt.xml
+++ b/build/bird/hvn1.lab.ipng.ch/tap1-0/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-0/root/libvirt.xml b/build/bird/hvn1.lab.ipng.ch/vpp1-0/root/libvirt.xml
index 0056863..c5f7287 100644
--- a/build/bird/hvn1.lab.ipng.ch/vpp1-0/root/libvirt.xml
+++ b/build/bird/hvn1.lab.ipng.ch/vpp1-0/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-1/root/libvirt.xml b/build/bird/hvn1.lab.ipng.ch/vpp1-1/root/libvirt.xml
index dd5f2e5..06c2260 100644
--- a/build/bird/hvn1.lab.ipng.ch/vpp1-1/root/libvirt.xml
+++ b/build/bird/hvn1.lab.ipng.ch/vpp1-1/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-2/root/libvirt.xml b/build/bird/hvn1.lab.ipng.ch/vpp1-2/root/libvirt.xml
index 690b0b3..1d236ac 100644
--- a/build/bird/hvn1.lab.ipng.ch/vpp1-2/root/libvirt.xml
+++ b/build/bird/hvn1.lab.ipng.ch/vpp1-2/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-3/root/libvirt.xml b/build/bird/hvn1.lab.ipng.ch/vpp1-3/root/libvirt.xml
index 0cfdadc..89e9e9f 100644
--- a/build/bird/hvn1.lab.ipng.ch/vpp1-3/root/libvirt.xml
+++ b/build/bird/hvn1.lab.ipng.ch/vpp1-3/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/bird/hvn2.lab.ipng.ch/host2-0/root/libvirt.xml b/build/bird/hvn2.lab.ipng.ch/host2-0/root/libvirt.xml
index e6d9f62..248991f 100644
--- a/build/bird/hvn2.lab.ipng.ch/host2-0/root/libvirt.xml
+++ b/build/bird/hvn2.lab.ipng.ch/host2-0/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/bird/hvn2.lab.ipng.ch/host2-1/root/libvirt.xml b/build/bird/hvn2.lab.ipng.ch/host2-1/root/libvirt.xml
index 01b75ad..991ad74 100644
--- a/build/bird/hvn2.lab.ipng.ch/host2-1/root/libvirt.xml
+++ b/build/bird/hvn2.lab.ipng.ch/host2-1/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/bird/hvn2.lab.ipng.ch/tap2-0/root/libvirt.xml b/build/bird/hvn2.lab.ipng.ch/tap2-0/root/libvirt.xml
index 8f04f2b..fb53cb1 100644
--- a/build/bird/hvn2.lab.ipng.ch/tap2-0/root/libvirt.xml
+++ b/build/bird/hvn2.lab.ipng.ch/tap2-0/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-0/root/libvirt.xml b/build/bird/hvn2.lab.ipng.ch/vpp2-0/root/libvirt.xml
index 1d8082d..438aa0d 100644
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/root/libvirt.xml
+++ b/build/bird/hvn2.lab.ipng.ch/vpp2-0/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-1/root/libvirt.xml b/build/bird/hvn2.lab.ipng.ch/vpp2-1/root/libvirt.xml
index 0c43c22..8804acc 100644
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/root/libvirt.xml
+++ b/build/bird/hvn2.lab.ipng.ch/vpp2-1/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-2/root/libvirt.xml b/build/bird/hvn2.lab.ipng.ch/vpp2-2/root/libvirt.xml
index 3cc77c3..b04f6bf 100644
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/root/libvirt.xml
+++ b/build/bird/hvn2.lab.ipng.ch/vpp2-2/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/root/libvirt.xml b/build/bird/hvn2.lab.ipng.ch/vpp2-3/root/libvirt.xml
index 85b01ad..65850bd 100644
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/root/libvirt.xml
+++ b/build/bird/hvn2.lab.ipng.ch/vpp2-3/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/bird/hvn3.lab.ipng.ch/host3-0/root/libvirt.xml b/build/bird/hvn3.lab.ipng.ch/host3-0/root/libvirt.xml
index 7440fe4..2045c1e 100644
--- a/build/bird/hvn3.lab.ipng.ch/host3-0/root/libvirt.xml
+++ b/build/bird/hvn3.lab.ipng.ch/host3-0/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/bird/hvn3.lab.ipng.ch/host3-1/root/libvirt.xml b/build/bird/hvn3.lab.ipng.ch/host3-1/root/libvirt.xml
index bd9abc0..034f3cd 100644
--- a/build/bird/hvn3.lab.ipng.ch/host3-1/root/libvirt.xml
+++ b/build/bird/hvn3.lab.ipng.ch/host3-1/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/bird/hvn3.lab.ipng.ch/tap3-0/root/libvirt.xml b/build/bird/hvn3.lab.ipng.ch/tap3-0/root/libvirt.xml
index 2f8dda2..2ddab08 100644
--- a/build/bird/hvn3.lab.ipng.ch/tap3-0/root/libvirt.xml
+++ b/build/bird/hvn3.lab.ipng.ch/tap3-0/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-0/root/libvirt.xml b/build/bird/hvn3.lab.ipng.ch/vpp3-0/root/libvirt.xml
index e7d14dd..64a7bf2 100644
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/root/libvirt.xml
+++ b/build/bird/hvn3.lab.ipng.ch/vpp3-0/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-1/root/libvirt.xml b/build/bird/hvn3.lab.ipng.ch/vpp3-1/root/libvirt.xml
index 1a22e88..b997458 100644
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/root/libvirt.xml
+++ b/build/bird/hvn3.lab.ipng.ch/vpp3-1/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-2/root/libvirt.xml b/build/bird/hvn3.lab.ipng.ch/vpp3-2/root/libvirt.xml
index 5e97001..cdec6b2 100644
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/root/libvirt.xml
+++ b/build/bird/hvn3.lab.ipng.ch/vpp3-2/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-3/root/libvirt.xml b/build/bird/hvn3.lab.ipng.ch/vpp3-3/root/libvirt.xml
index a9a0e0e..4f36b45 100644
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/root/libvirt.xml
+++ b/build/bird/hvn3.lab.ipng.ch/vpp3-3/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/frr/hvn0.lab.ipng.ch/host0-0/root/libvirt.xml b/build/frr/hvn0.lab.ipng.ch/host0-0/root/libvirt.xml
index 5cb8ae2..8a2c970 100644
--- a/build/frr/hvn0.lab.ipng.ch/host0-0/root/libvirt.xml
+++ b/build/frr/hvn0.lab.ipng.ch/host0-0/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/frr/hvn0.lab.ipng.ch/host0-1/root/libvirt.xml b/build/frr/hvn0.lab.ipng.ch/host0-1/root/libvirt.xml
index 464fc80..e727c43 100644
--- a/build/frr/hvn0.lab.ipng.ch/host0-1/root/libvirt.xml
+++ b/build/frr/hvn0.lab.ipng.ch/host0-1/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/frr/hvn0.lab.ipng.ch/tap0-0/root/libvirt.xml b/build/frr/hvn0.lab.ipng.ch/tap0-0/root/libvirt.xml
index 0434ed5..3e81e3d 100644
--- a/build/frr/hvn0.lab.ipng.ch/tap0-0/root/libvirt.xml
+++ b/build/frr/hvn0.lab.ipng.ch/tap0-0/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-0/root/libvirt.xml b/build/frr/hvn0.lab.ipng.ch/vpp0-0/root/libvirt.xml
index 5054db2..a099dc2 100644
--- a/build/frr/hvn0.lab.ipng.ch/vpp0-0/root/libvirt.xml
+++ b/build/frr/hvn0.lab.ipng.ch/vpp0-0/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-1/root/libvirt.xml b/build/frr/hvn0.lab.ipng.ch/vpp0-1/root/libvirt.xml
index d2ae07e..0c205c5 100644
--- a/build/frr/hvn0.lab.ipng.ch/vpp0-1/root/libvirt.xml
+++ b/build/frr/hvn0.lab.ipng.ch/vpp0-1/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-2/root/libvirt.xml b/build/frr/hvn0.lab.ipng.ch/vpp0-2/root/libvirt.xml
index 7161906..d3d09bc 100644
--- a/build/frr/hvn0.lab.ipng.ch/vpp0-2/root/libvirt.xml
+++ b/build/frr/hvn0.lab.ipng.ch/vpp0-2/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-3/root/libvirt.xml b/build/frr/hvn0.lab.ipng.ch/vpp0-3/root/libvirt.xml
index dcb3219..34f12f6 100644
--- a/build/frr/hvn0.lab.ipng.ch/vpp0-3/root/libvirt.xml
+++ b/build/frr/hvn0.lab.ipng.ch/vpp0-3/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/frr/hvn1.lab.ipng.ch/host1-0/root/libvirt.xml b/build/frr/hvn1.lab.ipng.ch/host1-0/root/libvirt.xml
index b72b6c3..156e65f 100644
--- a/build/frr/hvn1.lab.ipng.ch/host1-0/root/libvirt.xml
+++ b/build/frr/hvn1.lab.ipng.ch/host1-0/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/frr/hvn1.lab.ipng.ch/host1-1/root/libvirt.xml b/build/frr/hvn1.lab.ipng.ch/host1-1/root/libvirt.xml
index 09679a6..684fe04 100644
--- a/build/frr/hvn1.lab.ipng.ch/host1-1/root/libvirt.xml
+++ b/build/frr/hvn1.lab.ipng.ch/host1-1/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/frr/hvn1.lab.ipng.ch/tap1-0/root/libvirt.xml b/build/frr/hvn1.lab.ipng.ch/tap1-0/root/libvirt.xml
index 7f05d64..37c416e 100644
--- a/build/frr/hvn1.lab.ipng.ch/tap1-0/root/libvirt.xml
+++ b/build/frr/hvn1.lab.ipng.ch/tap1-0/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-0/root/libvirt.xml b/build/frr/hvn1.lab.ipng.ch/vpp1-0/root/libvirt.xml
index 0056863..c5f7287 100644
--- a/build/frr/hvn1.lab.ipng.ch/vpp1-0/root/libvirt.xml
+++ b/build/frr/hvn1.lab.ipng.ch/vpp1-0/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-1/root/libvirt.xml b/build/frr/hvn1.lab.ipng.ch/vpp1-1/root/libvirt.xml
index dd5f2e5..06c2260 100644
--- a/build/frr/hvn1.lab.ipng.ch/vpp1-1/root/libvirt.xml
+++ b/build/frr/hvn1.lab.ipng.ch/vpp1-1/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-2/root/libvirt.xml b/build/frr/hvn1.lab.ipng.ch/vpp1-2/root/libvirt.xml
index 690b0b3..1d236ac 100644
--- a/build/frr/hvn1.lab.ipng.ch/vpp1-2/root/libvirt.xml
+++ b/build/frr/hvn1.lab.ipng.ch/vpp1-2/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-3/root/libvirt.xml b/build/frr/hvn1.lab.ipng.ch/vpp1-3/root/libvirt.xml
index 0cfdadc..89e9e9f 100644
--- a/build/frr/hvn1.lab.ipng.ch/vpp1-3/root/libvirt.xml
+++ b/build/frr/hvn1.lab.ipng.ch/vpp1-3/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/frr/hvn2.lab.ipng.ch/host2-0/root/libvirt.xml b/build/frr/hvn2.lab.ipng.ch/host2-0/root/libvirt.xml
index e6d9f62..248991f 100644
--- a/build/frr/hvn2.lab.ipng.ch/host2-0/root/libvirt.xml
+++ b/build/frr/hvn2.lab.ipng.ch/host2-0/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/frr/hvn2.lab.ipng.ch/host2-1/root/libvirt.xml b/build/frr/hvn2.lab.ipng.ch/host2-1/root/libvirt.xml
index 01b75ad..991ad74 100644
--- a/build/frr/hvn2.lab.ipng.ch/host2-1/root/libvirt.xml
+++ b/build/frr/hvn2.lab.ipng.ch/host2-1/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/frr/hvn2.lab.ipng.ch/tap2-0/root/libvirt.xml b/build/frr/hvn2.lab.ipng.ch/tap2-0/root/libvirt.xml
index 8f04f2b..fb53cb1 100644
--- a/build/frr/hvn2.lab.ipng.ch/tap2-0/root/libvirt.xml
+++ b/build/frr/hvn2.lab.ipng.ch/tap2-0/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-0/root/libvirt.xml b/build/frr/hvn2.lab.ipng.ch/vpp2-0/root/libvirt.xml
index 1d8082d..438aa0d 100644
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-0/root/libvirt.xml
+++ b/build/frr/hvn2.lab.ipng.ch/vpp2-0/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-1/root/libvirt.xml b/build/frr/hvn2.lab.ipng.ch/vpp2-1/root/libvirt.xml
index 0c43c22..8804acc 100644
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-1/root/libvirt.xml
+++ b/build/frr/hvn2.lab.ipng.ch/vpp2-1/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-2/root/libvirt.xml b/build/frr/hvn2.lab.ipng.ch/vpp2-2/root/libvirt.xml
index 3cc77c3..b04f6bf 100644
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-2/root/libvirt.xml
+++ b/build/frr/hvn2.lab.ipng.ch/vpp2-2/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-3/root/libvirt.xml b/build/frr/hvn2.lab.ipng.ch/vpp2-3/root/libvirt.xml
index 85b01ad..65850bd 100644
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-3/root/libvirt.xml
+++ b/build/frr/hvn2.lab.ipng.ch/vpp2-3/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/frr/hvn3.lab.ipng.ch/host3-0/root/libvirt.xml b/build/frr/hvn3.lab.ipng.ch/host3-0/root/libvirt.xml
index 7440fe4..2045c1e 100644
--- a/build/frr/hvn3.lab.ipng.ch/host3-0/root/libvirt.xml
+++ b/build/frr/hvn3.lab.ipng.ch/host3-0/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/frr/hvn3.lab.ipng.ch/host3-1/root/libvirt.xml b/build/frr/hvn3.lab.ipng.ch/host3-1/root/libvirt.xml
index bd9abc0..034f3cd 100644
--- a/build/frr/hvn3.lab.ipng.ch/host3-1/root/libvirt.xml
+++ b/build/frr/hvn3.lab.ipng.ch/host3-1/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/frr/hvn3.lab.ipng.ch/tap3-0/root/libvirt.xml b/build/frr/hvn3.lab.ipng.ch/tap3-0/root/libvirt.xml
index 2f8dda2..2ddab08 100644
--- a/build/frr/hvn3.lab.ipng.ch/tap3-0/root/libvirt.xml
+++ b/build/frr/hvn3.lab.ipng.ch/tap3-0/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-0/root/libvirt.xml b/build/frr/hvn3.lab.ipng.ch/vpp3-0/root/libvirt.xml
index e7d14dd..64a7bf2 100644
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-0/root/libvirt.xml
+++ b/build/frr/hvn3.lab.ipng.ch/vpp3-0/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-1/root/libvirt.xml b/build/frr/hvn3.lab.ipng.ch/vpp3-1/root/libvirt.xml
index 1a22e88..b997458 100644
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-1/root/libvirt.xml
+++ b/build/frr/hvn3.lab.ipng.ch/vpp3-1/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-2/root/libvirt.xml b/build/frr/hvn3.lab.ipng.ch/vpp3-2/root/libvirt.xml
index 5e97001..cdec6b2 100644
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-2/root/libvirt.xml
+++ b/build/frr/hvn3.lab.ipng.ch/vpp3-2/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-3/root/libvirt.xml b/build/frr/hvn3.lab.ipng.ch/vpp3-3/root/libvirt.xml
index a9a0e0e..4f36b45 100644
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-3/root/libvirt.xml
+++ b/build/frr/hvn3.lab.ipng.ch/vpp3-3/root/libvirt.xml
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/overlays/_common/common/root/libvirt.xml.j2 b/overlays/_common/common/root/libvirt.xml.j2
index 907b586..041bf42 100644
--- a/overlays/_common/common/root/libvirt.xml.j2
+++ b/overlays/_common/common/root/libvirt.xml.j2
@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
+  <cpu mode='host-passthrough'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>