SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vmspawn: use parse_tristate_argument_with_auto()

Browse Source
This commit is contained in:
Mike Yuan
2026-02-20 21:21:01 +01:00
parent 577e5e9a5e
commit 39a5b957e1
2 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
man/systemd-vmspawn.xml
+12 -13
View File
@@ -166,8 +166,8 @@
<varlistentry>
<term><option>--kvm=<replaceable>BOOL</replaceable></option></term>
<listitem><para>If <option>--kvm=</option> is not specified, KVM support will be
detected automatically. If true, KVM is always used, and if false, KVM is never used.</para>
<listitem><para>Controls whether to enable KVM acceleration. If not specified or set to <option>auto</option>,
KVM support will be detected automatically. If true, KVM is insisted on. If false, disable KVM.</para>
<xi:include href="version-info.xml" xpointer="v255"/></listitem>
</varlistentry>
@@ -175,8 +175,9 @@
<varlistentry>
<term><option>--vsock=<replaceable>BOOL</replaceable></option></term>
<listitem><para>If <option>--vsock=</option> is not specified, VSOCK networking support will be
detected automatically. If true, VSOCK networking is always used, and if false, VSOCK networking is never used.</para>
<listitem><para>Controls whether to allocate a VSOCK socket for guest. If not specified or set to
<option>auto</option>, VSOCK networking support will be detected automatically. If true, VSOCK
is insisted on. If false, VSOCK networking is disabled.</para>
<xi:include href="version-info.xml" xpointer="v255"/></listitem>
</varlistentry>
@@ -198,12 +199,10 @@
<term><option>--tpm=<replaceable>BOOL</replaceable></option></term>
<listitem>
<para>If <option>--tpm=</option> is not specified, vmspawn will detect the presence of <citerefentry project='debian'>
<refentrytitle>swtpm</refentrytitle><manvolnum>8</manvolnum></citerefentry> and use it if
available. If yes is specified <citerefentry
project='debian'><refentrytitle>swtpm</refentrytitle><manvolnum>8</manvolnum></citerefentry> is
always used, and if no is set <citerefentry project='debian'><refentrytitle>swtpm</refentrytitle>
<manvolnum>8</manvolnum></citerefentry> is never used.</para>
<para>Controls whether to serve a TPM device for guest, via <citerefentry project='debian'>
<refentrytitle>swtpm</refentrytitle><manvolnum>8</manvolnum></citerefentry>. If not specified or
set to <option>auto</option>, vmspawn will detect the presence of swtpm binary automatically.
If yes, swtpm support is insisted on. If no, TPM is disabled.</para>
<xi:include href="version-info.xml" xpointer="v256"/>
</listitem>
@@ -311,9 +310,9 @@
<listitem><para>Configure whether to search for firmware which supports Secure Boot.</para>
<para>If the option is not specified, the first firmware which is detected will be used.
If the option is set to yes, then the first firmware with Secure Boot support will be selected.
If no is specified, then the first firmware without Secure Boot will be selected.</para>
<para>If the option is not specified or set to <option>auto</option>, the first firmware detected
will be used. If the option is set to yes, then the first firmware with Secure Boot support will
be selected. If no is specified, then the first firmware without Secure Boot will be selected.</para>
<xi:include href="version-info.xml" xpointer="v255"/></listitem>
</varlistentry>
src/vmspawn/vmspawn.c
+8 -8
View File
@@ -455,15 +455,15 @@ static int parse_argv(int argc, char *argv[]) {
break;
case ARG_KVM:
r = parse_tristate(optarg, &arg_kvm);
r = parse_tristate_argument_with_auto("--kvm=", optarg, &arg_kvm);
if (r < 0)
return log_error_errno(r, "Failed to parse --kvm=%s: %m", optarg);
return r;
break;
case ARG_VSOCK:
r = parse_tristate(optarg, &arg_vsock);
r = parse_tristate_argument_with_auto("--vsock=", optarg, &arg_vsock);
if (r < 0)
return log_error_errno(r, "Failed to parse --vsock=%s: %m", optarg);
return r;
break;
case ARG_VSOCK_CID:
@@ -483,9 +483,9 @@ static int parse_argv(int argc, char *argv[]) {
break;
case ARG_TPM:
r = parse_tristate(optarg, &arg_tpm);
r = parse_tristate_argument_with_auto("--tpm=", optarg, &arg_tpm);
if (r < 0)
return log_error_errno(r, "Failed to parse --tpm=%s: %m", optarg);
return r;
break;
case ARG_LINUX:
@@ -587,9 +587,9 @@ static int parse_argv(int argc, char *argv[]) {
}
case ARG_SECURE_BOOT:
r = parse_tristate(optarg, &arg_secure_boot);
r = parse_tristate_argument_with_auto("--secure-boot=", optarg, &arg_secure_boot);
if (r < 0)
return log_error_errno(r, "Failed to parse --secure-boot=%s: %m", optarg);
return r;
break;
case ARG_PRIVATE_USERS: