From: Mike Yuan Date: Wed, 11 Feb 2026 22:32:44 +0000 (+0100) Subject: vmspawn: use parse_tristate_argument_with_auto() X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39a5b957e1afe827181d4018e90efdb4aa7abeda;p=thirdparty%2Fsystemd.git vmspawn: use parse_tristate_argument_with_auto() --- diff --git a/man/systemd-vmspawn.xml b/man/systemd-vmspawn.xml index 0f2f6649e30..0b4fef2314a 100644 --- a/man/systemd-vmspawn.xml +++ b/man/systemd-vmspawn.xml @@ -166,8 +166,8 @@ - If is not specified, KVM support will be - detected automatically. If true, KVM is always used, and if false, KVM is never used. + Controls whether to enable KVM acceleration. If not specified or set to , + KVM support will be detected automatically. If true, KVM is insisted on. If false, disable KVM. @@ -175,8 +175,9 @@ - If 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. + Controls whether to allocate a VSOCK socket for guest. If not specified or set to + , VSOCK networking support will be detected automatically. If true, VSOCK + is insisted on. If false, VSOCK networking is disabled. @@ -198,12 +199,10 @@ - If is not specified, vmspawn will detect the presence of - swtpm8 and use it if - available. If yes is specified swtpm8 is - always used, and if no is set swtpm - 8 is never used. + Controls whether to serve a TPM device for guest, via + swtpm8. If not specified or + set to , vmspawn will detect the presence of swtpm binary automatically. + If yes, swtpm support is insisted on. If no, TPM is disabled. @@ -311,9 +310,9 @@ Configure whether to search for firmware which supports Secure Boot. - 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. + If the option is not specified or set to , 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. diff --git a/src/vmspawn/vmspawn.c b/src/vmspawn/vmspawn.c index 7cbe7fd5f93..e26e8244004 100644 --- a/src/vmspawn/vmspawn.c +++ b/src/vmspawn/vmspawn.c @@ -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: