From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 3 May 2024 12:15:55 +0000 (+0200)
Subject: mkosi: Insist on KVM, VSOCK and TPM by default
X-Git-Tag: v256-rc2~97^2~53
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1c329956e5995dfffec49139096b75d9bd42decc;p=thirdparty%2Fsystemd.git

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 6953f9e4eae..e080eb38048 100644
--- 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 0f2705f5fcb..1c2d448ef98 100644
--- 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