Proxmox/qemu-server
5
0
Fork 0
mirror of git://git.proxmox.com/git/qemu-server.git synced 2025-06-02 13:05:39 +03:00
Code Releases Activity

migrate: code cleanup: factor out variables for transferred memory and vfio

Browse Source 
Reviewed-by: Dominik Csapak <d.csapak@proxmox.com>
Tested-by: Dominik Csapak <d.csapak@proxmox.com>
Link: https://lore.proxmox.com/20250520131431.487048-1-f.ebner@proxmox.com
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fiona Ebner 2025-05-20 15:14:31 +02:00
parent 7d1ec25bc1
commit c760952771
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
PVE/QemuMigrate.pm
View File

@ -1286,6 +1286,9 @@ sub phase2 {
my $memstat = $stat->{ram};
my $mem_transferred = $memstat->{transferred} || 0;
my $vfio_transferred = $stat->{vfio}->{transferred} || 0;
if ($status eq 'completed') {
my $delay = time() - $start;
if ($delay > 0) {
@ -1294,11 +1297,9 @@ sub phase2 {
my $downtime = $stat->{downtime} || 0;
$self->log('info', "average migration speed: $avg_speed/s - downtime $downtime ms");
}
my $trans = $memstat->{transferred} || 0;
my $vfio_transferred = $stat->{vfio}->{transferred} || 0;
if ($trans > 0 || $vfio_transferred > 0) {
my $transferred_h = render_bytes($trans, 1);
if ($mem_transferred > 0 || $vfio_transferred > 0) {
my $transferred_h = render_bytes($mem_transferred, 1);
my $summary = "transferred $transferred_h VM-state";
if ($vfio_transferred > 0) {
@ -1321,14 +1322,9 @@ sub phase2 {
last;
}
if (
$memstat->{transferred} ne $last_mem_transferred
|| (defined($stat->{vfio}->{transferred})
&& $stat->{vfio}->{transferred} ne $last_vfio_transferred)
)
{
my $trans = $memstat->{transferred} || 0;
my $vfio_transferred = $stat->{vfio}->{transferred} || 0;
if ($mem_transferred ne $last_mem_transferred
|| $vfio_transferred ne $last_vfio_transferred
) {
my $rem = $memstat->{remaining} || 0;
my $total = $memstat->{total} || 0;
my $speed = ($memstat->{'pages-per-second'} // 0) * ($memstat->{'page-size'} // 0);
@ -1341,7 +1337,7 @@ sub phase2 {
my $should_log = $usleep > 100_000 ? 1 : ($i % 10) == 0;
my $total_h = render_bytes($total, 1);
my $transferred_h = render_bytes($trans, 1);
my $transferred_h = render_bytes($mem_transferred, 1);
my $speed_h = render_bytes($speed, 1);
my $progress = "transferred $transferred_h of $total_h VM-state, ${speed_h}/s";
@ -1391,8 +1387,8 @@ sub phase2 {
}
}
$last_mem_transferred = $memstat->{transferred};
$last_vfio_transferred = $stat->{vfio}->{transferred} // 0;
$last_mem_transferred = $mem_transferred;
$last_vfio_transferred = $vfio_transferred;
}
if ($self->{storage_migration}) {