proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-07 01:10:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

new option for vmstatus to query $full informations from KVM using qmp

Browse Source
This commit is contained in:
Dietmar Maurer 2012-07-13 09:25:58 +02:00
parent 7b7c6d1b5d
commit 03a33f3005
2 changed files with 48 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PVE/API2/Qemu.pm
View File

@ -1141,7 +1141,7 @@ __PACKAGE__->register_method({
# test if VM exists # test if VM exists
my $conf = PVE::QemuServer::load_config($param->{vmid}); my $conf = PVE::QemuServer::load_config($param->{vmid});
my $vmstatus = PVE::QemuServer::vmstatus($param->{vmid}); my $vmstatus = PVE::QemuServer::vmstatus($param->{vmid}, 1);
my $status = $vmstatus->{$param->{vmid}}; my $status = $vmstatus->{$param->{vmid}};
$status->{ha} = &$vm_is_ha_managed($param->{vmid}); $status->{ha} = &$vm_is_ha_managed($param->{vmid});

60
PVE/QemuServer.pm
View File

@ -1900,8 +1900,11 @@ sub disksize {
my $last_proc_pid_stat; my $last_proc_pid_stat;
# get VM status information
# This must be fast and should not block ($full == false)
# We only query KVM using QMP if $full == true (this can be slow)
sub vmstatus { sub vmstatus {
my ($opt_vmid) = @_; my ($opt_vmid, $full) = @_;
my $res = {}; my $res = {};
@ -1971,18 +1974,6 @@ sub vmstatus {
my $pid = $d->{pid}; my $pid = $d->{pid};
next if !$pid; next if !$pid;
if (my $fh = IO::File->new("/proc/$pid/io", "r")) {
my $data = {};
while (defined(my $line = <$fh>)) {
if ($line =~ m/^([rw]char):\s+(\d+)$/) {
$data->{$1} = $2;
}
}
close($fh);
$d->{diskread} = $data->{rchar} || 0;
$d->{diskwrite} = $data->{wchar} || 0;
}
my $pstat = PVE::ProcFSTools::read_proc_pid_stat($pid); my $pstat = PVE::ProcFSTools::read_proc_pid_stat($pid);
next if !$pstat; # not running next if !$pstat; # not running
@ -2020,6 +2011,49 @@ sub vmstatus {
} }
} }
return $res if !$full;
my $qmpclient = PVE::QMPClient->new();
my $blockstatscb = sub {
my ($vmid, $resp) = @_;
my $data = $resp->{'return'} || [];
my $totalrdbytes = 0;
my $totalwrbytes = 0;
for my $blockstat (@$data) {
$totalrdbytes = $totalrdbytes + $blockstat->{stats}->{rd_bytes};
$totalwrbytes = $totalwrbytes + $blockstat->{stats}->{wr_bytes};
}
$res->{$vmid}->{diskread} = $totalrdbytes;
$res->{$vmid}->{diskwrite} = $totalwrbytes;
};
my $statuscb = sub {
my ($vmid, $resp) = @_;
$qmpclient->queue_cmd($vmid, $blockstatscb, 'query-blockstats');
my $status = 'unknown';
if (!defined($status = $resp->{'return'}->{status})) {
warn "unable to get VM status\n";
return;
}
$res->{$vmid}->{qmpstatus} = $resp->{'return'}->{status};
};
foreach my $vmid (keys %$list) {
next if $opt_vmid && ($vmid ne $opt_vmid);
next if !$res->{$vmid}->{pid}; # not running
$qmpclient->queue_cmd($vmid, $statuscb, 'query-status');
}
$qmpclient->queue_execute();
foreach my $vmid (keys %$list) {
next if $opt_vmid && ($vmid ne $opt_vmid);
$res->{$vmid}->{qmpstatus} = $res->{$vmid}->{status} if !$res->{$vmid}->{qmpstatus};
}
return $res; return $res;
} }