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)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 2E9426BAE6 for ; Thu, 18 Mar 2021 10:45:29 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 21A8EEEEF for ; Thu, 18 Mar 2021 10:44:59 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 9DD33EEE7 for ; Thu, 18 Mar 2021 10:44:58 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 68C0046436 for ; Thu, 18 Mar 2021 10:44:58 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 18 Mar 2021 10:44:50 +0100 Message-Id: <20210318094452.738-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210318094452.738-1-f.ebner@proxmox.com> References: <20210318094452.738-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.003 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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: [pve-devel] [PATCH v2 qemu-server 2/4] restore: update config: remove unused parameter 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: Thu, 18 Mar 2021 09:45:29 -0000 Signed-off-by: Fabian Ebner --- New in v2 PVE/QemuServer.pm | 5 +---- test/run_qemu_restore_config_tests.pl | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index a6e6ae0..5fb052c 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -5900,7 +5900,7 @@ my $restore_allocate_devices = sub { }; sub restore_update_config_line { - my ($cookie, $vmid, $map, $line, $unique) = @_; + my ($cookie, $map, $line, $unique) = @_; return '' if $line =~ m/^\#qmdump\#/; return '' if $line =~ m/^\#vzdump\#/; @@ -6285,7 +6285,6 @@ sub restore_proxmox_backup_archive { while (defined(my $line = <$fh>)) { $new_conf_raw .= restore_update_config_line( $cookie, - $vmid, $map, $line, $options->{unique}, @@ -6458,7 +6457,6 @@ sub restore_vma_archive { while (defined(my $line = <$fh>)) { $new_conf_raw .= restore_update_config_line( $cookie, - $vmid, $map, $line, $opts->{unique}, @@ -6613,7 +6611,6 @@ sub restore_tar_archive { while (defined (my $line = <$srcfd>)) { $new_conf_raw .= restore_update_config_line( $cookie, - $vmid, $map, $line, $opts->{unique}, diff --git a/test/run_qemu_restore_config_tests.pl b/test/run_qemu_restore_config_tests.pl index d829216..e5d9f2a 100755 --- a/test/run_qemu_restore_config_tests.pl +++ b/test/run_qemu_restore_config_tests.pl @@ -52,7 +52,6 @@ dir_glob_foreach('./restore-config-input', '[0-9]+.conf', sub { while (defined(my $line = <$fh>)) { $got .= PVE::QemuServer::restore_update_config_line( $cookie, - $vmid, $map, $line, 0, -- 2.20.1