[Qemu-devel] [PULL v2 00/13] Migration tree

[Juan Quintela]

Hi

v2:
- Change Migration params from int to bool (Orit)
- Change %ld to %PRIu64 (Blue found it)
- cc Anthony O:-)

Atacched the interdiff, it is trivial, instead of repost all patches
(changes are really trivial).

Anthony, please pull.

v1:

Here are the patches that were reviewed and had no comments: Not
changes for the ones posted, just rebased to be sure that there were
no problem with merging (there weren't).

- Huge memory series (Juan Quintela)
- All that was not XBRLE (Orit)  form orit series
- missing check for host_from_stream_offset (Orit)

Anthony, Please pull.


The following changes since commit 71ea2e016131a9fcde6f1ffd3e0e34a64c21f593:

  bsd-user: fix build (2012-06-28 20:28:36 +0000)

are available in the git repository at:

  http://repo.or.cz/r/qemu/quintela.git migration-anthony-v2

for you to fetch changes up to 45f33f01f359d6028ec4b4018a2bf2ff53806e11:

  Maintain the number of dirty pages (2012-06-29 13:31:07 +0200)

----------------------------------------------------------------
Isaku Yamahata (1):
      Add MigrationParams structure

Juan Quintela (8):
      Add spent time for migration
      Add tracepoints for savevm section start/end
      No need to iterate if we already are over the limit
      Only TCG needs TLB handling
      Only calculate expected_time for stage 2
      Exit loop if we have been there too long
      dirty bitmap: abstract its use
      Maintain the number of dirty pages

Orit Wasserman (4):
      Add missing check for host_from_stream_offset return value for 
RAM_SAVE_FLAG_PAGE
      Add save_block_hdr function
      Add debugging infrastructure
      Add migration_end function

 arch_init.c       |  111 ++++++++++++++++++++++++++++++++++++-----------------
 block-migration.c |    8 ++--
 cpu-all.h         |    1 +
 exec-obsolete.h   |   50 ++++++++++++++----------
 exec.c            |   34 ++++++++++------
 hmp.c             |    2 +
 migration.c       |   24 +++++++++---
 migration.h       |    9 ++++-
 qapi-schema.json  |   12 ++++--
 qemu-common.h     |    1 +
 savevm.c          |   24 ++++++++++--
 sysemu.h          |    3 +-
 trace-events      |    5 +++
 vmstate.h         |    2 +-
 14 files changed, 198 insertions(+), 88 deletions(-)



Isaku Yamahata (1):
  Add MigrationParams structure

Juan Quintela (8):
  Add spent time for migration
  Add tracepoints for savevm section start/end
  No need to iterate if we already are over the limit
  Only TCG needs TLB handling
  Only calculate expected_time for stage 2
  Exit loop if we have been there too long
  dirty bitmap: abstract its use
  Maintain the number of dirty pages

Orit Wasserman (4):
  Add missing check for host_from_stream_offset return value for
    RAM_SAVE_FLAG_PAGE
  Add save_block_hdr function
  Add debugging infrastructure
  Add migration_end function

 arch_init.c       |  111 ++++++++++++++++++++++++++++++++++++-----------------
 block-migration.c |    8 ++--
 cpu-all.h         |    1 +
 exec-obsolete.h   |   50 ++++++++++++++----------
 exec.c            |   34 ++++++++++------
 hmp.c             |    2 +
 migration.c       |   24 +++++++++---
 migration.h       |    9 ++++-
 qapi-schema.json  |   12 ++++--
 qemu-common.h     |    1 +
 savevm.c          |   24 ++++++++++--
 sysemu.h          |    3 +-
 trace-events      |    5 +++
 vmstate.h         |    2 +-
 14 files changed, 198 insertions(+), 88 deletions(-)

-- 
1.7.10.4

diff --git a/arch_init.c b/arch_init.c
index 7ce074e..5b0f562 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -361,7 +361,8 @@ int ram_save_live(QEMUFile *f, int stage, void *opaque)
         if ((i & 63) == 0) {
             uint64_t t1 = (qemu_get_clock_ns(rt_clock) - bwidth) / 1000000;
             if (t1 > MAX_WAIT) {
-                DPRINTF("big wait: %ld milliseconds, %d iterations\n", t1, i);
+                DPRINTF("big wait: " PRIu64 " milliseconds, %d iterations\n",
+                        t1, i);
                 break;
             }
         }
@@ -398,8 +399,8 @@ int ram_save_live(QEMUFile *f, int stage, void *opaque)
         uint64_t expected_time;
         expected_time = ram_save_remaining() * TARGET_PAGE_SIZE / bwidth;

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

         return expected_time <= migrate_max_downtime();
     }
@@ -528,7 +529,7 @@ int ram_load(QEMUFile *f, void *opaque, int version_id)
     } while (!(flags & RAM_SAVE_FLAG_EOS));

 done:
-    DPRINTF("Completed load of VM with exit code %d seq iteration %ld\n",
+    DPRINTF("Completed load of VM with exit code %d seq iteration " PRIu64 
"\n",
             ret, seq_iter);
     return ret;
 }
diff --git a/migration.h b/migration.h
index 3990771..de13004 100644
--- a/migration.h
+++ b/migration.h
@@ -20,8 +20,8 @@
 #include "error.h"

 struct MigrationParams {
-    int blk;
-    int shared;
+    bool blk;
+    bool shared;
 };

 typedef struct MigrationState MigrationState;