From 6ee6046ef29f6188286ecefc3a4dce5cb25bf660 Mon Sep 17 00:00:00 2001 From: Fiona Ebner Date: Thu, 27 Jun 2024 13:03:15 +0200 Subject: [PATCH] fix #5562: tpm: avoid warning about undefined value when version is not explicitly set Fixes: f9dde219 ("fix #3075: add TPM v1.2 and v2.0 support via swtpm") Signed-off-by: Fiona Ebner --- PVE/QemuServer.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 5e2f5e2a..55ad8a7a 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -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