public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 qemu-server 2/4] restore: update config: remove unused parameter
Date: Thu, 18 Mar 2021 10:44:50 +0100	[thread overview]
Message-ID: <20210318094452.738-2-f.ebner@proxmox.com> (raw)
In-Reply-To: <20210318094452.738-1-f.ebner@proxmox.com>

Signed-off-by: Fabian Ebner <f.ebner@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





  reply	other threads:[~2021-03-18  9:45 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-18  9:44 [pve-devel] [PATCH v2 qemu-server 1/4] test: add tests for restoring config Fabian Ebner
2021-03-18  9:44 ` Fabian Ebner [this message]
2021-04-18 16:15   ` [pve-devel] applied: [PATCH v2 qemu-server 2/4] restore: update config: remove unused parameter Thomas Lamprecht
2021-03-18  9:44 ` [pve-devel] [PATCH v2 qemu-server 3/4] restore: sanitize config for non-root users Fabian Ebner
2021-04-18 16:17   ` Thomas Lamprecht
2021-03-18  9:44 ` [pve-devel] [PATCH v2 qemu-server 4/4] restore: sanitize config: use new warning system Fabian Ebner
2021-04-18 16:15 ` [pve-devel] applied: [PATCH v2 qemu-server 1/4] test: add tests for restoring config Thomas Lamprecht

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=20210318094452.738-2-f.ebner@proxmox.com \
    --to=f.ebner@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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal