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 3B9B7979A for ; Tue, 26 Apr 2022 14:31:02 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BF9861B8A5 for ; Tue, 26 Apr 2022 14:31:01 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 059921B827 for ; Tue, 26 Apr 2022 14:30:59 +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 C97C542BE1 for ; Tue, 26 Apr 2022 14:30:58 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Tue, 26 Apr 2022 14:30:51 +0200 Message-Id: <20220426123055.110358-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220426123055.110358-1-f.ebner@proxmox.com> References: <20220426123055.110358-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.083 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 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. [qemu.pm, qemuserver.pm] Subject: [pve-devel] [PATCH v3 qemu-server 2/3] api: create: allow overriding non-disk options during restore 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: Tue, 26 Apr 2022 12:31:02 -0000 Signed-off-by: Fabian Ebner --- No changes from v2. PVE/API2/Qemu.pm | 8 ++++++-- PVE/QemuServer.pm | 26 ++++++++++++++++++++------ 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 61aee0ba..54af11a0 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -819,8 +819,11 @@ __PACKAGE__->register_method({ } if ($archive) { - my $keystr = join(' ', keys %$param); - raise_param_exc({ archive => "option conflicts with other options ($keystr)"}) if $keystr; + for my $opt (sort keys $param->%*) { + if (PVE::QemuServer::Drive::is_valid_drivename($opt)) { + raise_param_exc({ $opt => "option conflicts with option 'archive'" }); + } + } if ($archive eq '-') { die "pipe requires cli environment\n" if $rpcenv->{type} ne 'cli'; @@ -876,6 +879,7 @@ __PACKAGE__->register_method({ unique => $unique, bwlimit => $bwlimit, live => $live_restore, + override_conf => $param, }; if ($archive->{type} eq 'file' || $archive->{type} eq 'pipe') { die "live-restore is only compatible with backup images from a Proxmox Backup Server\n" diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 5db10fe6..2a3e6d58 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -6480,6 +6480,17 @@ my $restore_destroy_volumes = sub { } }; +my $restore_merge_config = sub { + my ($filename, $backup_conf_raw, $override_conf) = @_; + + my $backup_conf = parse_vm_config($filename, $backup_conf_raw); + for my $key (keys $override_conf->%*) { + $backup_conf->{$key} = $override_conf->{$key}; + } + + return $backup_conf; +}; + sub scan_volids { my ($cfg, $vmid) = @_; @@ -6789,9 +6800,8 @@ sub restore_proxmox_backup_archive { $new_conf_raw .= "\nlock: create"; } - PVE::Tools::file_set_contents($conffile, $new_conf_raw); - - PVE::Cluster::cfs_update(); # make sure we read new file + my $new_conf = $restore_merge_config->($conffile, $new_conf_raw, $options->{override_conf}); + PVE::QemuConfig->write_config($vmid, $new_conf); eval { rescan($vmid, 1); }; warn $@ if $@; @@ -7095,9 +7105,8 @@ sub restore_vma_archive { die $err; } - PVE::Tools::file_set_contents($conffile, $new_conf_raw); - - PVE::Cluster::cfs_update(); # make sure we read new file + my $new_conf = $restore_merge_config->($conffile, $new_conf_raw, $opts->{override_conf}); + PVE::QemuConfig->write_config($vmid, $new_conf); eval { rescan($vmid, 1); }; warn $@ if $@; @@ -7108,6 +7117,11 @@ sub restore_vma_archive { sub restore_tar_archive { my ($archive, $vmid, $user, $opts) = @_; + if (scalar(keys $opts->{override_conf}->%*) > 0) { + my $keystring = join(' ', keys $opts->{override_conf}->%*); + die "cannot pass along options ($keystring) when restoring from tar archive\n"; + } + if ($archive ne '-') { my $firstfile = tar_archive_read_firstfile($archive); die "ERROR: file '$archive' does not look like a QemuServer vzdump backup\n" -- 2.30.2