From 1eb2d149db6afd065ef9b30e6ccf3b7f8547920c Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 4 May 2021 15:40:45 +0200
Subject: [PATCH] testing: Use host-passthrough CPU mode for all KVM guests

This should give us the best performance and feature set on modern
hardware (in particular when compared to code2duo, which e.g. does not allow
nested virtualization).

Closes strongswan/strongswan#340.
---
 testing/config/kvm/alice.xml    | 1 +
 testing/config/kvm/bob.xml      | 1 +
 testing/config/kvm/carol.xml    | 1 +
 testing/config/kvm/dave.xml     | 1 +
 testing/config/kvm/moon.xml     | 6 +-----
 testing/config/kvm/sun.xml      | 6 +-----
 testing/config/kvm/venus.xml    | 1 +
 testing/config/kvm/winnetou.xml | 1 +
 8 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/testing/config/kvm/alice.xml b/testing/config/kvm/alice.xml
index 63fefbe44d..3eb2a99a9d 100644
--- a/testing/config/kvm/alice.xml
+++ b/testing/config/kvm/alice.xml
@@ -10,6 +10,7 @@
     <cmdline>root=/dev/vda1 loglevel=1 console=hvc0 net.ifnames=0</cmdline>
     <boot dev='hd'/>
   </os>
+  <cpu mode='host-passthrough'></cpu>
   <features>
     <acpi/>
     <apic/>
diff --git a/testing/config/kvm/bob.xml b/testing/config/kvm/bob.xml
index 48bef74868..90acb7fb14 100644
--- a/testing/config/kvm/bob.xml
+++ b/testing/config/kvm/bob.xml
@@ -10,6 +10,7 @@
     <cmdline>root=/dev/vda1 loglevel=1 console=hvc0 net.ifnames=0</cmdline>
     <boot dev='hd'/>
   </os>
+  <cpu mode='host-passthrough'></cpu>
   <features>
     <acpi/>
     <apic/>
diff --git a/testing/config/kvm/carol.xml b/testing/config/kvm/carol.xml
index d7249c38c8..96f23dfe22 100644
--- a/testing/config/kvm/carol.xml
+++ b/testing/config/kvm/carol.xml
@@ -10,6 +10,7 @@
     <cmdline>root=/dev/vda1 loglevel=1 console=hvc0 net.ifnames=0</cmdline>
     <boot dev='hd'/>
   </os>
+  <cpu mode='host-passthrough'></cpu>
   <features>
     <acpi/>
     <apic/>
diff --git a/testing/config/kvm/dave.xml b/testing/config/kvm/dave.xml
index bf070f1b13..369514dbac 100644
--- a/testing/config/kvm/dave.xml
+++ b/testing/config/kvm/dave.xml
@@ -10,6 +10,7 @@
     <cmdline>root=/dev/vda1 loglevel=1 console=hvc0 net.ifnames=0</cmdline>
     <boot dev='hd'/>
   </os>
+  <cpu mode='host-passthrough'></cpu>
   <features>
     <acpi/>
     <apic/>
diff --git a/testing/config/kvm/moon.xml b/testing/config/kvm/moon.xml
index 4ffaf809a8..398e36f6c1 100644
--- a/testing/config/kvm/moon.xml
+++ b/testing/config/kvm/moon.xml
@@ -10,11 +10,7 @@
     <cmdline>root=/dev/vda1 loglevel=1 console=hvc0 net.ifnames=0</cmdline>
     <boot dev='hd'/>
   </os>
-  <cpu>
-    <model fallback='allow'>core2duo</model>
-    <feature policy='optional' name='aes'/>
-    <feature policy='optional' name='pclmuldq'/>
-  </cpu>
+  <cpu mode='host-passthrough'></cpu>
   <features>
     <acpi/>
     <apic/>
diff --git a/testing/config/kvm/sun.xml b/testing/config/kvm/sun.xml
index 2e5a382ea0..f77839ad0a 100644
--- a/testing/config/kvm/sun.xml
+++ b/testing/config/kvm/sun.xml
@@ -10,11 +10,7 @@
     <cmdline>root=/dev/vda1 loglevel=1 console=hvc0 net.ifnames=0</cmdline>
     <boot dev='hd'/>
   </os>
-  <cpu>
-    <model fallback='allow'>core2duo</model>
-    <feature policy='optional' name='aes'/>
-    <feature policy='optional' name='pclmuldq'/>
-  </cpu>
+  <cpu mode='host-passthrough'></cpu>
   <features>
     <acpi/>
     <apic/>
diff --git a/testing/config/kvm/venus.xml b/testing/config/kvm/venus.xml
index a0b60171b5..aa15705c61 100644
--- a/testing/config/kvm/venus.xml
+++ b/testing/config/kvm/venus.xml
@@ -10,6 +10,7 @@
     <cmdline>root=/dev/vda1 loglevel=1 console=hvc0 net.ifnames=0</cmdline>
     <boot dev='hd'/>
   </os>
+  <cpu mode='host-passthrough'></cpu>
   <features>
     <acpi/>
     <apic/>
diff --git a/testing/config/kvm/winnetou.xml b/testing/config/kvm/winnetou.xml
index 3b42e38f27..7ada13180b 100644
--- a/testing/config/kvm/winnetou.xml
+++ b/testing/config/kvm/winnetou.xml
@@ -10,6 +10,7 @@
     <cmdline>root=/dev/vda1 loglevel=1 console=hvc0 net.ifnames=0</cmdline>
     <boot dev='hd'/>
   </os>
+  <cpu mode='host-passthrough'></cpu>
   <features>
     <acpi/>
     <apic/>
-- 
2.47.2