vmspawn: add --smbios11= switch for passing arbitrary smbios type #11 strings to vm

diff --git a/man/systemd-vmspawn.xml b/man/systemd-vmspawn.xml
index dfd3bbd7b4ffb4f9f1dc5c16c89dd668df98c9f5..0be886cb131d7983144f74be4f680747d1618ce2 100644 (file)
--- a/man/systemd-vmspawn.xml
+++ b/man/systemd-vmspawn.xml
@@ -265,6 +265,18 @@
 
           <xi:include href="version-info.xml" xpointer="v255"/></listitem>
         </varlistentry>
+
+        <varlistentry>
+          <term><option>--smbios11=<replaceable>STRING</replaceable></option></term>
+          <term><option>-s <replaceable>STRING</replaceable></option></term>
+
+          <listitem><para>Passes the specified string into the VM as an SMBIOS Type #11 vendor string. This
+          is useful to parameterize the invoked VM in various ways. See
+          <citerefentry><refentrytitle>smbios-type-11</refentrytitle><manvolnum>7</manvolnum></citerefentry>
+          for details.</para>
+
+          <xi:include href="version-info.xml" xpointer="v258"/></listitem>
+        </varlistentry>
       </variablelist>
     </refsect2>
 

diff --git a/src/vmspawn/vmspawn.c b/src/vmspawn/vmspawn.c
index a5d18fd65523ba007d789dc207810178ed0bbf16..b38bb9ab93174c4ce189701f02c7f59be137bd2b 100644 (file)
--- a/src/vmspawn/vmspawn.c
+++ b/src/vmspawn/vmspawn.c
@@ -117,6 +117,7 @@ static bool arg_pass_ssh_key = true;
 static char *arg_ssh_key_type = NULL;
 static bool arg_discard_disk = true;
 struct ether_addr arg_network_provided_mac = {};
+static char **arg_smbios11 = NULL;
 
 STATIC_DESTRUCTOR_REGISTER(arg_directory, freep);
 STATIC_DESTRUCTOR_REGISTER(arg_image, freep);
@@ -133,6 +134,7 @@ STATIC_DESTRUCTOR_REGISTER(arg_kernel_cmdline_extra, strv_freep);
 STATIC_DESTRUCTOR_REGISTER(arg_extra_drives, strv_freep);
 STATIC_DESTRUCTOR_REGISTER(arg_background, freep);
 STATIC_DESTRUCTOR_REGISTER(arg_ssh_key_type, freep);
+STATIC_DESTRUCTOR_REGISTER(arg_smbios11, strv_freep);
 
 static int help(void) {
         _cleanup_free_ char *link = NULL;
@@ -167,6 +169,7 @@ static int help(void) {
                "     --secure-boot=BOOL    Enable searching for firmware supporting SecureBoot\n"
                "     --firmware=PATH|list  Select firmware definition file (or list available)\n"
                "     --discard-disk=BOOL   Control processing of discard requests\n"
+               "  -s --smbios11=STRING     Pass an arbitrary SMBIOS Type #11 string to the VM\n"
                "\n%3$sSystem Identity:%4$s\n"
                "  -M --machine=NAME        Set the machine name for the VM\n"
                "     --uuid=UUID           Set a specific machine UUID for the VM\n"
@@ -295,6 +298,7 @@ static int parse_argv(int argc, char *argv[]) {
                 { "firmware",          required_argument, NULL, ARG_FIRMWARE          },
                 { "discard-disk",      required_argument, NULL, ARG_DISCARD_DISK      },
                 { "background",        required_argument, NULL, ARG_BACKGROUND        },
+                { "smbios11",          required_argument, NULL, 's'                   },
                 {}
         };
 
@@ -304,7 +308,7 @@ static int parse_argv(int argc, char *argv[]) {
         assert(argv);
 
         optind = 0;
-        while ((c = getopt_long(argc, argv, "+hD:i:M:nq", options, NULL)) >= 0)
+        while ((c = getopt_long(argc, argv, "+hD:i:M:nqs:", options, NULL)) >= 0)
                 switch (c) {
                 case 'h':
                         return help();
@@ -564,6 +568,20 @@ static int parse_argv(int argc, char *argv[]) {
                                 return r;
                         break;
 
+                case 's':
+                        if (isempty(optarg)) {
+                                arg_smbios11 = strv_free(arg_smbios11);
+                                break;
+                        }
+
+                        if (!utf8_is_valid(optarg))
+                                return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "SMBIOS Type 11 string is not UTF-8 clean, refusing: %s", optarg);
+
+                        if (strv_extend(&arg_smbios11, optarg) < 0)
+                                return log_oom();
+
+                        break;
+
                 case '?':
                         return -EINVAL;
 
@@ -961,6 +979,33 @@ static int cmdline_add_kernel_cmdline(char ***cmdline, const char *kernel) {
         return 0;
 }
 
+static int cmdline_add_smbios11(char ***cmdline) {
+        assert(cmdline);
+
+        if (strv_isempty(arg_smbios11))
+                return 0;
+
+        if (!ARCHITECTURE_SUPPORTS_SMBIOS) {
+                log_warning("Cannot issue SMBIOS Type #11 strings, native architecture doesn't support SMBIOS, ignoring.");
+                return 0;
+        }
+
+        STRV_FOREACH(i, arg_smbios11) {
+                _cleanup_free_ char *escaped = NULL;
+                escaped = escape_qemu_value(*i);
+                if (!escaped)
+                        return log_oom();
+
+                if (strv_extend(cmdline, "-smbios") < 0)
+                        return log_oom();
+
+                if (strv_extendf(cmdline, "type=11,value=%s", escaped) < 0)
+                        return log_oom();
+        }
+
+        return 0;
+}
+
 static int start_tpm(
                 sd_bus *bus,
                 const char *scope,
@@ -1908,6 +1953,10 @@ static int run_virtual_machine(int kvm_device_fd, int vhost_device_fd) {
         if (r < 0)
                 return r;
 
+        r = cmdline_add_smbios11(&cmdline);
+        if (r < 0)
+                return r;
+
         /* disable TPM autodetection if the user's hardware doesn't support it */
         if (!ARCHITECTURE_SUPPORTS_TPM) {
                 if (arg_tpm < 0) {