From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 801461FF15C for ; Fri, 13 Jun 2025 11:29:47 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4F429C951; Fri, 13 Jun 2025 11:30:10 +0200 (CEST) Date: Fri, 13 Jun 2025 11:30:02 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20250612140253.106555-1-f.ebner@proxmox.com> <20250612140253.106555-6-f.ebner@proxmox.com> In-Reply-To: <20250612140253.106555-6-f.ebner@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1749806686.x1blbg5c6l.astroid@yuna.none> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.045 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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, proxmox.com] Subject: Re: [pve-devel] [PATCH qemu-server 05/22] restore: parse drive with additional properties 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" On June 12, 2025 4:02 pm, Fiona Ebner wrote: > For backwards-compat, to allow dropping some drive properties that are > long gone from QEMU. > > Signed-off-by: Fiona Ebner > --- > PVE/QemuServer.pm | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm > index 58a5cfa8..5408ba8a 100644 > --- a/PVE/QemuServer.pm > +++ b/PVE/QemuServer.pm > @@ -6818,7 +6818,7 @@ sub restore_update_config_line { > } elsif ($line =~ m/^((ide|scsi|virtio|sata|efidisk|tpmstate)\d+):\s*(\S+)\s*$/) { > my $virtdev = $1; > my $value = $3; > - my $di = parse_drive($virtdev, $value); > + my $di = parse_drive($virtdev, $value, { 'additional-properties' => 1 }); there's another call to parse_drive on the raw config line in `parse_backup_hints` - granted, that is only for cloudinit drives, but might still make sense to set it there as well in case that call site does more in the future? setting this here might also have side-effects when restoring backups made on newer PVE systems on older ones (which is never guaranteed to work, of course), right? should we make it more selective, e.g. by passing a list of keys that should be skipped? or just mangling the line to remove those specific keys and not allowing *all* additional properties? property strings are thankfully rather straight-forward to split into properties and recombine ;) > if (defined($di->{backup}) && !$di->{backup}) { > $res .= "#$line"; > } elsif ($map->{$virtdev}) { > -- > 2.39.5 > > > > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel > > > _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel