a7b9285033
Alias qemu-system-* man page to qemu.1 (bz #907746) Drop execute bit on service files (bz #963917) Conditionalize KSM service on host virt support (bz #963681) Split out KSM package, make it not pulled in by default
46 lines
1.8 KiB
Diff
46 lines
1.8 KiB
Diff
From c6c8a4fa26f5aa2f687a779997a2bd040cd01ff4 Mon Sep 17 00:00:00 2001
|
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
Date: Fri, 22 Feb 2013 17:36:43 +0100
|
|
Subject: [PATCH] migration: use qemu_ftell to compute bandwidth
|
|
|
|
Prepare for when s->bytes_xfer will be removed.
|
|
|
|
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
|
|
Reviewed-by: Juan Quintela <quintela@redhat.com>
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
(cherry picked from commit be7172e22a9c3bc448894e57f6c2d1af6ffd47fd)
|
|
---
|
|
migration.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/migration.c b/migration.c
|
|
index 26ba6c9..def1e9e 100644
|
|
--- a/migration.c
|
|
+++ b/migration.c
|
|
@@ -589,6 +589,7 @@ static void *migration_thread(void *opaque)
|
|
MigrationState *s = opaque;
|
|
int64_t initial_time = qemu_get_clock_ms(rt_clock);
|
|
int64_t sleep_time = 0;
|
|
+ int64_t initial_bytes = 0;
|
|
int64_t max_size = 0;
|
|
int64_t start_time = initial_time;
|
|
bool old_vm_running = false;
|
|
@@ -629,7 +630,7 @@ static void *migration_thread(void *opaque)
|
|
}
|
|
current_time = qemu_get_clock_ms(rt_clock);
|
|
if (current_time >= initial_time + BUFFER_DELAY) {
|
|
- uint64_t transferred_bytes = s->bytes_xfer;
|
|
+ uint64_t transferred_bytes = qemu_ftell(s->file) - initial_bytes;
|
|
uint64_t time_spent = current_time - initial_time - sleep_time;
|
|
double bandwidth = transferred_bytes / time_spent;
|
|
max_size = bandwidth * migrate_max_downtime() / 1000000;
|
|
@@ -646,6 +647,7 @@ static void *migration_thread(void *opaque)
|
|
s->bytes_xfer = 0;
|
|
sleep_time = 0;
|
|
initial_time = current_time;
|
|
+ initial_bytes = qemu_ftell(s->file);
|
|
}
|
|
if (qemu_file_rate_limit(s->file)) {
|
|
/* usleep expects microseconds */
|