From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 12 Mar 2023 18:56:50 +0000 (+0100)
Subject: Add --qemu-smbios option
X-Git-Tag: v15~296^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ab1df3ce2760796d381e5bd8af8ac874e1235f5;p=thirdparty%2Fmkosi.git

Add --qemu-smbios option

This can be used to set io.systemd.stub.kernel-cmdline-extra to add
extra kernel cmdline arguments at runtime.
---

diff --git a/mkosi.md b/mkosi.md
index aa60b9f93..840932ac2 100644
--- a/mkosi.md
+++ b/mkosi.md
@@ -813,6 +813,11 @@ a boolean argument: either "1", "yes", or "true" to enable, or "0",
 : Space-delimited list of additional arguments to pass when invoking
   qemu.
 
+`QemuSMBIOS=`
+
+: Space-delimited list of additional SMBIOS Type 11 strings to pass
+  when invoking qemu.
+
 `Netdev=`, `--netdev`
 
 : When used with the boot or qemu verbs, this option creates a virtual
diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 89dd76dc7..afea77673 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1301,6 +1301,7 @@ class ArgumentParserMkosi(argparse.ArgumentParser):
         "SignExpectedPCR": "--sign-expected-pcr",
         "RepositoryDirectories": "--repository-directory",
         "Credentials": "--credential",
+        "QemuSMBIOS": "--qemu-smbios",
     }
 
     def __init__(self, *kargs: Any, **kwargs: Any) -> None:
@@ -1910,6 +1911,12 @@ def create_parser() -> ArgumentParserMkosi:
         # arguments.
         help=argparse.SUPPRESS,
     )
+    group.add_argument(
+        "--qemu-smbios",
+        action=RepeatableSpaceDelimitedListAction,
+        default=[],
+        help="Set an SMBIOS Type 11 string when running qemu",
+    )
     group.add_argument(
         "--network-veth",     # Compatibility option
         dest="netdev",
@@ -3672,6 +3679,8 @@ def run_qemu(config: MkosiConfig) -> None:
 
     for k, v in config.credentials.items():
         cmdline += ["-smbios", f"type=11,value=io.systemd.credential:{k}={v}"]
+    for v in config.qemu_smbios:
+        cmdline += ["-smbios", f"type=11,value={v}"]
 
     with contextlib.ExitStack() as stack:
         if fw_supports_sb:
diff --git a/mkosi/backend.py b/mkosi/backend.py
index e44de931d..a129eb311 100644
--- a/mkosi/backend.py
+++ b/mkosi/backend.py
@@ -317,6 +317,7 @@ class MkosiConfig:
     qemu_mem: str
     qemu_kvm: bool
     qemu_args: Sequence[str]
+    qemu_smbios: Sequence[str]
 
     passphrase: Optional[Path]