From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 30D057456D for ; Fri, 9 Jul 2021 09:11:52 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 19F0A20CF2 for ; Fri, 9 Jul 2021 09:11:22 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id E632F20CE1 for ; Fri, 9 Jul 2021 09:11:20 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id B3CC040834 for ; Fri, 9 Jul 2021 09:11:20 +0200 (CEST) To: pve-devel@lists.proxmox.com References: <20210708112535.147775-3-s.reiter@proxmox.com> <20210708114602.346989-1-s.reiter@proxmox.com> From: Fabian Ebner Message-ID: Date: Fri, 9 Jul 2021 09:11:14 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210708114602.346989-1-s.reiter@proxmox.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.539 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemuserver.pm] Subject: Re: [pve-devel] [PATCH v2 qemu-server 3/3] restore: remove efidisk from config if not backed up X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Jul 2021 07:11:52 -0000 Am 08.07.21 um 13:46 schrieb Stefan Reiter: > If it doesn't exist, there's no need to keep it around at all. Such a > backup might easily be created if an efidisk is configured with BIOS > set to anything but 'OVMF'. > > Unbreaks live-restore for such cases too. > > Signed-off-by: Stefan Reiter > --- > > v1->v2: > * Actually remove efidisk from config, not just from launched version for > live-restore - first, this allows one to restart the VM after the live-restore > is done without errors, and second this way it also applies for normal > restores (no reason to keep an efidisk configured that doesn't exist). > After testing both I think I like this approach better, but feel free to keep > the v1 version too... > > PVE/QemuServer.pm | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm > index 4082e69..9af0ad3 100644 > --- a/PVE/QemuServer.pm > +++ b/PVE/QemuServer.pm > @@ -6044,7 +6044,7 @@ my $restore_allocate_devices = sub { > }; > > sub restore_update_config_line { > - my ($cookie, $map, $line, $unique) = @_; > + my ($cookie, $map, $line, $unique, $rpcenv) = @_; > General question, because this will pop up often with the new task warnings: should using RPCEnvironment::get() within each function that needs it be preferred over passing it around as a parameter? > return '' if $line =~ m/^\#qmdump\#/; > return '' if $line =~ m/^\#vzdump\#/; > @@ -6088,6 +6088,11 @@ sub restore_update_config_line { > $di->{file} = $map->{$virtdev}; > $value = print_drive($di); > $res .= "$virtdev: $value\n"; > + } elsif ($line =~ m/^efidisk0/) { > + # ignore efidisk, this can happen when backing up a SeaBIOS VM with > + # an efidisk configured > + $rpcenv->warn("efidisk in config, but not backed up - removing from config") > + if $rpcenv; > } else { > $res .= $line; > } > @@ -6428,6 +6433,7 @@ sub restore_proxmox_backup_archive { > $map, > $line, > $options->{unique}, > + $rpcenv, > ); > } > >