mkosi: Insist on KVM, VSOCK and TPM by default

By default mkosi will not run VMs with these features if they're not
available, but since various stuff in systemd makes use of these, let's
fail loudly if any of these are not available by default in systemd.

Users can still override these defaults locally if they wish.

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 6953f9e4eae0b0a6166e67a5d955318e7fedd701..e080eb3804856abad497665b032d9e362905f007 100644 (file)
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -121,8 +121,6 @@ jobs:
         [Host]
         ToolsTree=default
         ToolsTreeDistribution=fedora
-        QemuVsock=yes
-        QemuKvm=yes
         # TODO: Drop once https://bugs.launchpad.net/ubuntu/+source/linux/+bug/2038777 is fixed in Github Actions
         QemuFirmware=uefi
         EOF

diff --git a/mkosi.conf b/mkosi.conf
index 0f2705f5fcb3ec65486386d15b12eac7749f4744..1c2d448ef98fafeb6b343d67760870764d81dc09 100644 (file)
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -41,4 +41,7 @@ Credentials=journal.storage=persistent
 @Incremental=yes
 @RuntimeBuildSources=yes
 @QemuSmp=2
+@QemuSwtpm=yes
+@QemuVsock=yes
+@QemuKvm=yes
 ToolsTreePackages=virtiofsd