proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-11 02:25:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change format for unused drives

Browse Source 
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 <f.ebner@proxmox.com>
Reviewed-By: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Ebner 2020-03-12 11:19:12 +01:00 committed by Thomas Lamprecht
parent 7c4351f7d4
commit 758a08eb39
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
PVE/QemuServer/Drive.pm
View File

@ -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";