From: Stefan Reiter <s.reiter@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH qemu-server 2/3] cfg2cmd: only warn on non-existant ISO image
Date: Thu, 8 Jul 2021 13:25:34 +0200 [thread overview]
Message-ID: <20210708112535.147775-2-s.reiter@proxmox.com> (raw)
In-Reply-To: <20210708112535.147775-1-s.reiter@proxmox.com>
...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 <s.reiter@proxmox.com>
---
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
next prev parent reply other threads:[~2021-07-08 11:25 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-08 11:25 [pve-devel] [PATCH qemu-server 1/3] live-restore: fail early if target storage doesn't exist Stefan Reiter
2021-07-08 11:25 ` Stefan Reiter [this message]
2021-07-08 11:25 ` [pve-devel] [PATCH qemu-server 3/3] live-restore: ignore missing efidisk Stefan Reiter
2021-07-08 11:46 ` [pve-devel] [PATCH v2 qemu-server 3/3] restore: remove efidisk from config if not backed up Stefan Reiter
2021-07-09 7:11 ` Fabian Ebner
2021-07-09 13:30 ` Thomas Lamprecht
2021-07-23 9:02 ` Thomas Lamprecht
2021-08-02 10:15 ` Stefan Reiter
2021-07-23 9:06 ` [pve-devel] applied: [PATCH qemu-server 1/3] live-restore: fail early if target storage doesn't exist 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=20210708112535.147775-2-s.reiter@proxmox.com \
--to=s.reiter@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