[pve-devel] [PATCH v2 qemu-server 2/4] restore: update config: remove unused parameter

Fabian Ebner f.ebner at proxmox.com
Thu Mar 18 10:44:50 CET 2021


Signed-off-by: Fabian Ebner <f.ebner at proxmox.com>
---

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






More information about the pve-devel mailing list