proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-04-29 20:18:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #5562: tpm: avoid warning about undefined value when version is not explicitly set

Browse Source 
Fixes: f9dde219 ("fix #3075: add TPM v1.2 and v2.0 support via swtpm")
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fiona Ebner 2024-06-27 13:03:15 +02:00 committed by Fabian Grünbichler
parent 581b678320
commit 6ee6046ef2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PVE/QemuServer.pm
View File

@ -3163,9 +3163,9 @@ sub start_swtpm {
"--not-overwrite", # ignore existing state, do not modify
];
push @$setup_cmd, "--tpm2" if $tpm->{version} eq 'v2.0';
push @$setup_cmd, "--tpm2" if $tpm->{version} && $tpm->{version} eq 'v2.0';
# TPM 2.0 supports ECC crypto, use if possible
push @$setup_cmd, "--ecc" if $tpm->{version} eq 'v2.0';
push @$setup_cmd, "--ecc" if $tpm->{version} && $tpm->{version} eq 'v2.0';
run_command($setup_cmd, outfunc => sub {
print "swtpm_setup: $1\n";
@ -3189,7 +3189,7 @@ sub start_swtpm {
"--log",
"file=/run/qemu-server/$vmid-swtpm.log,level=1,prefix=$log_prefix",
];
push @$emulator_cmd, "--tpm2" if $tpm->{version} eq 'v2.0';
push @$emulator_cmd, "--tpm2" if $tpm->{version} && $tpm->{version} eq 'v2.0';
run_command($emulator_cmd, outfunc => sub { print $1; });
my $tries = 100; # swtpm may take a bit to start before daemonizing, wait up to 5s for pid