[elbe-devel] [PATCH] Remove qemu -enable-kvm option

[Bastian Germann]

QEMU's -enable-kvm option maps to the old-style -accel which is incompatible
with the -machine accel option in current qemu versions. The -machine accel
option is implied by the 'hvm' machine type that is used with Elbe's defaults.

Drop all -enable-kvm appearances so Elbe is compatible with bookworm.
KVM will still be active because of 'hvm'.

Fixes: #347

Signed-off-by: Bastian Germann <bage at linutronix.de>
---
 elbepack/xmldefaults.py               | 1 -
 schema/dbsfed.xsd                     | 2 +-
 tests/simple-amd64-bookworm.xml       | 2 +-
 tests/simple-amd64-with-grub-uefi.xml | 2 +-
 tests/simple-amd64-with-grub.xml      | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/elbepack/xmldefaults.py b/elbepack/xmldefaults.py
index 493519a292..5c7c7cb819 100644
--- a/elbepack/xmldefaults.py
+++ b/elbepack/xmldefaults.py
@@ -132,7 +132,6 @@ ppc64el_defaults = {
 amd64_defaults = {
     "arch": "amd64",
     "interpreter": "qemu-system-x86_64",
-    "interpreter-args": ["-enable-kvm"],
     "console": "ttyS0,115200n1",
     "machine": "pc",
     "nicmodel": "virtio",
diff --git a/schema/dbsfed.xsd b/schema/dbsfed.xsd
index 72bca5a3d6..2aa5bb3706 100644
--- a/schema/dbsfed.xsd
+++ b/schema/dbsfed.xsd
@@ -580,7 +580,7 @@ SPDX-FileCopyrightText: Linutronix GmbH
       <element name="interpreter-opts" type="rfs:string" minOccurs="1" maxOccurs="1">
         <annotation>
           <documentation>
-            Options to pass to the interpreter. e.g., -enable-kvm or
+            Options to pass to the interpreter. e.g.,
             -drive format=raw,file=$ELBE_IMG or -hda $ELBE_IMG
 
             Word expansion is done before passing it to the
diff --git a/tests/simple-amd64-bookworm.xml b/tests/simple-amd64-bookworm.xml
index fe2c31a73e..4aa3420ec5 100644
--- a/tests/simple-amd64-bookworm.xml
+++ b/tests/simple-amd64-bookworm.xml
@@ -79,7 +79,7 @@
 		<check>
 			<img>sda.img.tar.gz</img>
 			<interpreter>qemu-system-x86_64</interpreter>
-			<interpreter-opts>-m 2G -enable-kvm -cpu host -drive format=raw,file=$ELBE_IMG -nographic</interpreter-opts>
+			<interpreter-opts>-m 2G -cpu host -drive format=raw,file=$ELBE_IMG -nographic</interpreter-opts>
 
 			<action> <login /> </action>
 		</check>
diff --git a/tests/simple-amd64-with-grub-uefi.xml b/tests/simple-amd64-with-grub-uefi.xml
index cbe9b99d46..e310e6fc54 100644
--- a/tests/simple-amd64-with-grub-uefi.xml
+++ b/tests/simple-amd64-with-grub-uefi.xml
@@ -90,7 +90,7 @@
 			figure out a way to pass variants from elbe-ci to
 			elbe-check-build first.
 			-->
-			<interpreter-opts>-bios OVMF.fd -m 2G -enable-kvm -cpu host -drive format=raw,file=$ELBE_IMG</interpreter-opts>
+			<interpreter-opts>-bios OVMF.fd -m 2G -cpu host -drive format=raw,file=$ELBE_IMG</interpreter-opts>
 
 			<action> <login /> </action>
 		</check>
diff --git a/tests/simple-amd64-with-grub.xml b/tests/simple-amd64-with-grub.xml
index 5ad3102978..805bf7e284 100644
--- a/tests/simple-amd64-with-grub.xml
+++ b/tests/simple-amd64-with-grub.xml
@@ -79,7 +79,7 @@
 		<check>
 			<img>sda.img.tar.gz</img>
 			<interpreter>qemu-system-x86_64</interpreter>
-			<interpreter-opts>-m 2G -enable-kvm -cpu host -drive format=raw,file=$ELBE_IMG -nographic</interpreter-opts>
+			<interpreter-opts>-m 2G -cpu host -drive format=raw,file=$ELBE_IMG -nographic</interpreter-opts>
 
 			<action> <login /> </action>
 		</check>
-- 
2.39.1