proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-05 09:12:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix verbose qm status output

Browse Source 
we did not check if some values were hash refs in
the verbose output.

this patch adds a recursive hash print sub and uses it

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2016-07-18 10:50:31 +02:00 committed by Fabian Grünbichler
parent ec647db4f8
commit 81fff836fb
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
PVE/CLI/qm.pm
View File

@ -75,6 +75,32 @@ sub run_vnc_proxy {
exit(0); exit(0);
} }
sub print_recursive_hash {
my ($prefix, $hash, $key) = @_;
if (ref($hash) eq 'HASH') {
if (defined($key)) {
print "$prefix$key:\n";
}
foreach my $itemkey (keys %$hash) {
print_recursive_hash("\t$prefix", $hash->{$itemkey}, $itemkey);
}
} elsif (ref($hash) eq 'ARRAY') {
if (defined($key)) {
print "$prefix$key:\n";
}
foreach my $item (@$hash) {
print_recursive_hash("\t$prefix", $item);
}
} elsif (!ref($hash) && defined($hash)) {
if (defined($key)) {
print "$prefix$key: $hash\n";
} else {
print "$prefix$hash\n";
}
}
}
__PACKAGE__->register_method ({ __PACKAGE__->register_method ({
name => 'showcmd', name => 'showcmd',
path => 'showcmd', path => 'showcmd',
@ -125,8 +151,7 @@ __PACKAGE__->register_method ({
foreach my $k (sort (keys %$stat)) { foreach my $k (sort (keys %$stat)) {
next if $k eq 'cpu' || $k eq 'relcpu'; # always 0 next if $k eq 'cpu' || $k eq 'relcpu'; # always 0
my $v = $stat->{$k}; my $v = $stat->{$k};
next if !defined($v); print_recursive_hash("", $v, $k);
print "$k: $v\n";
} }
} else { } else {
my $status = $stat->{qmpstatus} || 'unknown'; my $status = $stat->{qmpstatus} || 'unknown';