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 21B2465F95 for ; Wed, 9 Mar 2022 11:10:05 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9256B1B9C4 for ; Wed, 9 Mar 2022 11:09:32 +0100 (CET) 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 005721B860 for ; Wed, 9 Mar 2022 11:09:26 +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 B9ED9463C9 for ; Wed, 9 Mar 2022 11:09:26 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Wed, 9 Mar 2022 11:09:15 +0100 Message-Id: <20220309100919.31512-14-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220309100919.31512-1-f.ebner@proxmox.com> References: <20220309100919.31512-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.123 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v12 qemu-server 13/16] api: factor out check/cleanup for drive params 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: Wed, 09 Mar 2022 10:10:05 -0000 Signed-off-by: Fabian Ebner --- PVE/API2/Qemu.pm | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 3b86034..7c3bb91 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -63,6 +63,23 @@ my $resolve_cdrom_alias = sub { } }; +my $check_drive_param = sub { + my ($param, $storecfg, $extra_checks) = @_; + + for my $opt (sort keys $param->%*) { + next if !PVE::QemuServer::is_valid_drivename($opt); + + my $drive = PVE::QemuServer::parse_drive($opt, $param->{$opt}); + raise_param_exc({ $opt => "unable to parse drive options" }) if !$drive; + + PVE::QemuServer::cleanup_drive_path($opt, $storecfg, $drive); + + $extra_checks->($drive) if $extra_checks; + + $param->{$opt} = PVE::QemuServer::print_drive($drive); + } +}; + my $NEW_DISK_RE = qr!^(([^/:\s]+):)?(\d+(\.\d+)?)$!; my $check_storage_access = sub { my ($rpcenv, $authuser, $storecfg, $vmid, $settings, $default_storage) = @_; @@ -617,15 +634,7 @@ __PACKAGE__->register_method({ &$check_cpu_model_access($rpcenv, $authuser, $param); - foreach my $opt (keys %$param) { - if (PVE::QemuServer::is_valid_drivename($opt)) { - my $drive = PVE::QemuServer::parse_drive($opt, $param->{$opt}); - raise_param_exc({ $opt => "unable to parse drive options" }) if !$drive; - - PVE::QemuServer::cleanup_drive_path($opt, $storecfg, $drive); - $param->{$opt} = PVE::QemuServer::print_drive($drive); - } - } + $check_drive_param->($param, $storecfg); PVE::QemuServer::add_random_macs($param); } else { @@ -1195,15 +1204,10 @@ my $update_vm_api = sub { die "cannot add non-replicatable volume to a replicated VM\n"; }; + $check_drive_param->($param, $storecfg, $check_replication); + foreach my $opt (keys %$param) { - if (PVE::QemuServer::is_valid_drivename($opt)) { - # cleanup drive path - my $drive = PVE::QemuServer::parse_drive($opt, $param->{$opt}); - raise_param_exc({ $opt => "unable to parse drive options" }) if !$drive; - PVE::QemuServer::cleanup_drive_path($opt, $storecfg, $drive); - $check_replication->($drive); - $param->{$opt} = PVE::QemuServer::print_drive($drive); - } elsif ($opt =~ m/^net(\d+)$/) { + if ($opt =~ m/^net(\d+)$/) { # add macaddr my $net = PVE::QemuServer::parse_net($param->{$opt}); $param->{$opt} = PVE::QemuServer::print_net($net); -- 2.30.2