From 758a08eb39cbce40ad20d2b5021ab0b6d45ebb79 Mon Sep 17 00:00:00 2001 From: Fabian Ebner Date: Thu, 12 Mar 2020 11:19:12 +0100 Subject: [PATCH] Change format for unused drives MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit and make it match with what parse_drive does. Even though the 'real' format was pve-volume-id, callers already expected that parse_drive returns a hash with a valid 'file' key (e.g. PVE/API2/Qemu.pm:1147ff). Signed-off-by: Fabian Ebner Reviewed-By: Fabian Grünbichler --- PVE/QemuServer/Drive.pm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/PVE/QemuServer/Drive.pm b/PVE/QemuServer/Drive.pm index e927abf1..d4121473 100644 --- a/PVE/QemuServer/Drive.pm +++ b/PVE/QemuServer/Drive.pm @@ -355,9 +355,20 @@ for (my $i = 0; $i < $MAX_VIRTIO_DISKS; $i++) { $drivedesc_hash->{efidisk0} = $efidisk_desc; +my $unused_fmt = { + volume => { alias => 'file' }, + file => { + type => 'string', + format => 'pve-volume-id', + default_key => 1, + format_description => 'volume', + description => "The drive's backing volume.", + }, +}; + our $unuseddesc = { optional => 1, - type => 'string', format => 'pve-volume-id', + type => 'string', format => $unused_fmt, description => "Reference to unused volumes. This is used internally, and should not be modified manually.", }; @@ -418,7 +429,7 @@ sub parse_drive { return undef; } - my $desc = $key =~ /^unused\d+$/ ? $alldrive_fmt + my $desc = $key =~ /^unused\d+$/ ? $unuseddesc->{format} : $drivedesc_hash->{$key}->{format}; if (!$desc) { warn "invalid drive key: $key\n"; -- 2.39.5