Patchwork [4/7] migration: rename expected_time to expected_downtime

login
register
mail settings
Submitter Juan Quintela
Date Aug. 13, 2012, 10:50 a.m.
Message ID <1344855057-32509-5-git-send-email-quintela@redhat.com>
Download mbox | patch
Permalink /patch/176908/
State New
Headers show

Comments

Juan Quintela - Aug. 13, 2012, 10:50 a.m.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 arch_init.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
Eric Blake - Aug. 13, 2012, 3:05 p.m.
On 08/13/2012 04:50 AM, Juan Quintela wrote:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  arch_init.c | 17 +++++++++--------
>  1 file changed, 9 insertions(+), 8 deletions(-)

Trivial rename.

> @@ -576,24 +576,25 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
>      bwidth = qemu_get_clock_ns(rt_clock) - bwidth;
>      bwidth = (bytes_transferred - bytes_transferred_last) / bwidth;
> 
> -    /* if we haven't transferred anything this round, force expected_time to a
> -     * a very high value, but without crashing */
> +    /* if we haven't transferred anything this round, force
> +     * expected_downtime to a a very high value, but without

s/a a/a/

Latent typo, but the reformatting exposes it more.  With that fixed,

Reviewed-by: Eric Blake <eblake@redhat.com>

Patch

diff --git a/arch_init.c b/arch_init.c
index 9b46bfc..5559d68 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -537,7 +537,7 @@  static int ram_save_iterate(QEMUFile *f, void *opaque)
     double bwidth = 0;
     int ret;
     int i;
-    uint64_t expected_time;
+    uint64_t expected_downtime;

     bytes_transferred_last = bytes_transferred;
     bwidth = qemu_get_clock_ns(rt_clock);
@@ -576,24 +576,25 @@  static int ram_save_iterate(QEMUFile *f, void *opaque)
     bwidth = qemu_get_clock_ns(rt_clock) - bwidth;
     bwidth = (bytes_transferred - bytes_transferred_last) / bwidth;

-    /* if we haven't transferred anything this round, force expected_time to a
-     * a very high value, but without crashing */
+    /* if we haven't transferred anything this round, force
+     * expected_downtime to a a very high value, but without
+     * crashing */
     if (bwidth == 0) {
         bwidth = 0.000001;
     }

     qemu_put_be64(f, RAM_SAVE_FLAG_EOS);

-    expected_time = ram_save_remaining() * TARGET_PAGE_SIZE / bwidth;
+    expected_downtime = ram_save_remaining() * TARGET_PAGE_SIZE / bwidth;

     DPRINTF("ram_save_live: expected(" PRIu64 ") <= max(" PRIu64 ")?\n",
-            expected_time, migrate_max_downtime());
+            expected_downtime, migrate_max_downtime());

-    if (expected_time <= migrate_max_downtime()) {
+    if (expected_downtime <= migrate_max_downtime()) {
         memory_global_sync_dirty_bitmap(get_system_memory());
-        expected_time = ram_save_remaining() * TARGET_PAGE_SIZE / bwidth;
+        expected_downtime = ram_save_remaining() * TARGET_PAGE_SIZE / bwidth;

-        return expected_time <= migrate_max_downtime();
+        return expected_downtime <= migrate_max_downtime();
     }
     return 0;
 }