From: Filip Schauer <f.schauer@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Subject: Re: [pve-devel] [PATCH v2 qemu-server] fix #3963: Skip TPM startup for template VMs
Date: Wed, 9 Aug 2023 11:35:54 +0200 (CEST) [thread overview]
Message-ID: <541796354.2208.1691573754089@webmail.proxmox.com> (raw)
In-Reply-To: <20230809092200.34150-1-f.schauer@proxmox.com>
I messed up the formatting the formatting there. What I meant to say:
Changes since v1:
* Add a missing not sign in front of the is_template check
> On 09.08.2023 11:22 CEST Filip Schauer <f.schauer@proxmox.com> wrote:
>
>
> Skip the software TPM startup when starting a template VM for performing
> a backup. This fixes an error that occurs when the TPM state disk is
> write-protected.
>
> Signed-off-by: Filip Schauer <f.schauer@proxmox.com>
> ---
> PVE/QemuServer.pm | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
> index 484bc7f..c262c68 100644
> --- a/PVE/QemuServer.pm
> +++ b/PVE/QemuServer.pm
> @@ -5923,7 +5923,7 @@ sub vm_start_nolock {
> PVE::Systemd::enter_systemd_scope($vmid, "Proxmox VE VM $vmid", %systemd_properties);
>
> my $tpmpid;
> - if (my $tpm = $conf->{tpmstate0}) {
> + if ((my $tpm = $conf->{tpmstate0}) && !PVE::QemuConfig->is_template($conf)) {
> # start the TPM emulator so QEMU can connect on start
> $tpmpid = start_swtpm($storecfg, $vmid, $tpm, $migratedfrom);
> }
> --
>
> Whoops, missed a not in front of the is_template check.
>
> 2.39.2
>
>
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next prev parent reply other threads:[~2023-08-09 9:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-09 9:22 Filip Schauer
2023-08-09 9:35 ` Filip Schauer [this message]
2023-08-09 12:06 ` Fiona Ebner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=541796354.2208.1691573754089@webmail.proxmox.com \
--to=f.schauer@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox