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

qm: style/indentation/cleanup fixes for command definition

Browse Source 
and record some possible FIXMEs for a next point/major release

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2021-11-11 13:34:35 +01:00
parent 3b43845ad1
commit e849ff6f91
1 changed files with 27 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
PVE/CLI/qm.pm
View File

@ -878,30 +878,25 @@ sub param_mapping {
} }
our $cmddef = { our $cmddef = {
list => [ "PVE::API2::Qemu", 'vmlist', [], list=> [ "PVE::API2::Qemu", 'vmlist', [], { node => $nodename }, sub {
{ node => $nodename }, sub { my $vmlist = shift;
my $vmlist = shift;
exit 0 if (!scalar(@$vmlist)); exit 0 if (!scalar(@$vmlist));
printf "%10s %-20s %-10s %-10s %12s %-10s\n", printf "%10s %-20s %-10s %-10s %12s %-10s\n",
qw(VMID NAME STATUS MEM(MB) BOOTDISK(GB) PID); qw(VMID NAME STATUS MEM(MB) BOOTDISK(GB) PID);
foreach my $rec (sort { $a->{vmid} <=> $b->{vmid} } @$vmlist) { foreach my $rec (sort { $a->{vmid} <=> $b->{vmid} } @$vmlist) {
printf "%10s %-20s %-10s %-10s %12.2f %-10s\n", $rec->{vmid}, $rec->{name}, printf "%10s %-20s %-10s %-10s %12.2f %-10s\n", $rec->{vmid}, $rec->{name},
$rec->{qmpstatus} || $rec->{status}, $rec->{qmpstatus} || $rec->{status},
($rec->{maxmem} || 0)/(1024*1024), ($rec->{maxmem} || 0)/(1024*1024),
($rec->{maxdisk} || 0)/(1024*1024*1024), ($rec->{maxdisk} || 0)/(1024*1024*1024),
$rec->{pid}||0; $rec->{pid} || 0;
} }
}],
} ],
create => [ "PVE::API2::Qemu", 'create_vm', ['vmid'], { node => $nodename }, $upid_exit ], create => [ "PVE::API2::Qemu", 'create_vm', ['vmid'], { node => $nodename }, $upid_exit ],
destroy => [ "PVE::API2::Qemu", 'destroy_vm', ['vmid'], { node => $nodename }, $upid_exit ], destroy => [ "PVE::API2::Qemu", 'destroy_vm', ['vmid'], { node => $nodename }, $upid_exit ],
clone => [ "PVE::API2::Qemu", 'clone_vm', ['vmid', 'newid'], { node => $nodename }, $upid_exit ], clone => [ "PVE::API2::Qemu", 'clone_vm', ['vmid', 'newid'], { node => $nodename }, $upid_exit ],
migrate => [ "PVE::API2::Qemu", 'migrate_vm', ['vmid', 'target'], { node => $nodename }, $upid_exit ], migrate => [ "PVE::API2::Qemu", 'migrate_vm', ['vmid', 'target'], { node => $nodename }, $upid_exit ],
@ -915,24 +910,24 @@ our $cmddef = {
unlink => [ "PVE::API2::Qemu", 'unlink', ['vmid'], { node => $nodename } ], unlink => [ "PVE::API2::Qemu", 'unlink', ['vmid'], { node => $nodename } ],
config => [ "PVE::API2::Qemu", 'vm_config', ['vmid'], config => [ "PVE::API2::Qemu", 'vm_config', ['vmid'], { node => $nodename }, sub {
{ node => $nodename }, sub { my $config = shift;
my $config = shift; foreach my $k (sort (keys %$config)) {
foreach my $k (sort (keys %$config)) { next if $k eq 'digest';
next if $k eq 'digest'; my $v = $config->{$k};
my $v = $config->{$k}; if ($k eq 'description') {
if ($k eq 'description') { $v = PVE::Tools::encode_text($v);
$v = PVE::Tools::encode_text($v); }
} print "$k: $v\n";
print "$k: $v\n"; }
} }],
}],
pending => [ "PVE::API2::Qemu", 'vm_pending', ['vmid'], { node => $nodename }, \&PVE::GuestHelpers::format_pending ], pending => [ "PVE::API2::Qemu", 'vm_pending', ['vmid'], { node => $nodename }, \&PVE::GuestHelpers::format_pending ],
showcmd => [ __PACKAGE__, 'showcmd', ['vmid']], showcmd => [ __PACKAGE__, 'showcmd', ['vmid']],
status => [ __PACKAGE__, 'status', ['vmid']], status => [ __PACKAGE__, 'status', ['vmid']],
# FIXME: for 8.0 move to command group snapshot { create, list, destroy, rollback }
snapshot => [ "PVE::API2::Qemu", 'snapshot', ['vmid', 'snapname'], { node => $nodename } , $upid_exit ], snapshot => [ "PVE::API2::Qemu", 'snapshot', ['vmid', 'snapname'], { node => $nodename } , $upid_exit ],
delsnapshot => [ "PVE::API2::Qemu", 'delsnapshot', ['vmid', 'snapname'], { node => $nodename } , $upid_exit ], delsnapshot => [ "PVE::API2::Qemu", 'delsnapshot', ['vmid', 'snapname'], { node => $nodename } , $upid_exit ],
@ -943,18 +938,13 @@ our $cmddef = {
template => [ "PVE::API2::Qemu", 'template', ['vmid'], { node => $nodename }], template => [ "PVE::API2::Qemu", 'template', ['vmid'], { node => $nodename }],
# FIXME: should be in a power command group?
start => [ "PVE::API2::Qemu", 'vm_start', ['vmid'], { node => $nodename } , $upid_exit ], start => [ "PVE::API2::Qemu", 'vm_start', ['vmid'], { node => $nodename } , $upid_exit ],
stop => [ "PVE::API2::Qemu", 'vm_stop', ['vmid'], { node => $nodename }, $upid_exit ], stop => [ "PVE::API2::Qemu", 'vm_stop', ['vmid'], { node => $nodename }, $upid_exit ],
reset => [ "PVE::API2::Qemu", 'vm_reset', ['vmid'], { node => $nodename }, $upid_exit ], reset => [ "PVE::API2::Qemu", 'vm_reset', ['vmid'], { node => $nodename }, $upid_exit ],
shutdown => [ "PVE::API2::Qemu", 'vm_shutdown', ['vmid'], { node => $nodename }, $upid_exit ], shutdown => [ "PVE::API2::Qemu", 'vm_shutdown', ['vmid'], { node => $nodename }, $upid_exit ],
reboot => [ "PVE::API2::Qemu", 'vm_reboot', ['vmid'], { node => $nodename }, $upid_exit ], reboot => [ "PVE::API2::Qemu", 'vm_reboot', ['vmid'], { node => $nodename }, $upid_exit ],
suspend => [ "PVE::API2::Qemu", 'vm_suspend', ['vmid'], { node => $nodename }, $upid_exit ], suspend => [ "PVE::API2::Qemu", 'vm_suspend', ['vmid'], { node => $nodename }, $upid_exit ],
resume => [ "PVE::API2::Qemu", 'vm_resume', ['vmid'], { node => $nodename }, $upid_exit ], resume => [ "PVE::API2::Qemu", 'vm_resume', ['vmid'], { node => $nodename }, $upid_exit ],
sendkey => [ "PVE::API2::Qemu", 'vm_sendkey', ['vmid', 'key'], { node => $nodename } ], sendkey => [ "PVE::API2::Qemu", 'vm_sendkey', ['vmid', 'key'], { node => $nodename } ],
@ -965,6 +955,7 @@ our $cmddef = {
unlock => [ __PACKAGE__, 'unlock', ['vmid']], unlock => [ __PACKAGE__, 'unlock', ['vmid']],
# FIXME: should this be in a 'disk' command group with move and resize and import?
rescan => [ __PACKAGE__, 'rescan', []], rescan => [ __PACKAGE__, 'rescan', []],
monitor => [ __PACKAGE__, 'monitor', ['vmid']], monitor => [ __PACKAGE__, 'monitor', ['vmid']],