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 552BA74321 for ; Thu, 8 Jul 2021 13:25:45 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 522EC175F1 for ; Thu, 8 Jul 2021 13:25:45 +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 C8025175D6 for ; Thu, 8 Jul 2021 13:25:43 +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 9A71540EFD for ; Thu, 8 Jul 2021 13:25:43 +0200 (CEST) From: Stefan Reiter To: pve-devel@lists.proxmox.com Date: Thu, 8 Jul 2021 13:25:34 +0200 Message-Id: <20210708112535.147775-2-s.reiter@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210708112535.147775-1-s.reiter@proxmox.com> References: <20210708112535.147775-1-s.reiter@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.647 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. [qemuserver.pm] Subject: [pve-devel] [PATCH qemu-server 2/3] cfg2cmd: only warn on non-existant ISO image 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, 08 Jul 2021 11:25:45 -0000 ...instead of hard failing. Requires a RPCEnvironment to issue the warnings, so init a dummy one in run_config2command_tests. Signed-off-by: Stefan Reiter --- PVE/QemuServer.pm | 10 ++++++++++ test/run_config2command_tests.pl | 2 ++ 2 files changed, 12 insertions(+) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 0d8affa..4082e69 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -3195,6 +3195,8 @@ sub config_to_command { my $kvm = $conf->{kvm}; my $nodename = nodename(); + my $rpcenv = PVE::RPCEnvironment::get(); + my $arch = get_vm_arch($conf); my $kvm_binary = get_command_for_arch($arch); my $kvmver = kvm_user_version($kvm_binary); @@ -3635,6 +3637,14 @@ sub config_to_command { PVE::QemuConfig->foreach_volume($conf, sub { my ($ds, $drive) = @_; + if (drive_is_cdrom($drive)) { + my $iso_path = get_iso_path($storecfg, $vmid, $drive->{file}); + if ($iso_path ne '' && ! -e $iso_path) { + $rpcenv->warn("$ds: image '$iso_path' doesn't exist, ignoring for CDROM"); + $drive->{file} = 'none'; + } + } + if (PVE::Storage::parse_volume_id($drive->{file}, 1)) { check_volume_storage_type($storecfg, $drive->{file}); push @$vollist, $drive->{file}; diff --git a/test/run_config2command_tests.pl b/test/run_config2command_tests.pl index 04df9d9..a2c3be3 100755 --- a/test/run_config2command_tests.pl +++ b/test/run_config2command_tests.pl @@ -404,6 +404,8 @@ sub do_test($) { print "testing config to command stabillity\n"; +PVE::RPCEnvironment->init('cli'); + # exec tests if (my $file = shift) { do_test $file; -- 2.30.2