summary refs log tree commit diff stats
path: root/migration
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-03-09 01:07:16 +0000
committerPeter Maydell <peter.maydell@linaro.org>2016-03-09 01:07:16 +0000
commit8519c8e0730039e2925ddb7cc8cfa588a1ef9d13 (patch)
tree018507e35db6cfd73f69341c94da93e7de8109c5 /migration
parent3293680dc79c9a4fbbc2bbdd9395a886825a87a2 (diff)
parent28b90d9c19d368645f475e36297ca21c53c38799 (diff)
downloadfocaccia-qemu-8519c8e0730039e2925ddb7cc8cfa588a1ef9d13.tar.gz
focaccia-qemu-8519c8e0730039e2925ddb7cc8cfa588a1ef9d13.zip
Merge remote-tracking branch 'remotes/amit-migration/tags/migration-for-2.6-6' into staging
migration:
* add avx2 instruction optimization, speeds up zero-page checking on
  compatible architectures and compilers (gcc 4.9+)
* add additional postcopy stats to 'info migrate' output

# gpg: Signature made Tue 08 Mar 2016 11:29:48 GMT using RSA key ID 854083B6
# gpg: Good signature from "Amit Shah <amit@amitshah.net>"
# gpg:                 aka "Amit Shah <amit@kernel.org>"
# gpg:                 aka "Amit Shah <amitshah@gmx.net>"

* remotes/amit-migration/tags/migration-for-2.6-6:
  cutils: add avx2 instruction optimization
  configure: detect ifunc and avx2 attribute
  Postcopy: Fix sync count in info migrate

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration')
-rw-r--r--migration/migration.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/migration/migration.c b/migration/migration.c
index 0129d9f420..7d13377b8e 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -635,6 +635,7 @@ MigrationInfo *qmp_query_migrate(Error **errp)
         info->ram->normal_bytes = norm_mig_bytes_transferred();
         info->ram->dirty_pages_rate = s->dirty_pages_rate;
         info->ram->mbps = s->mbps;
+        info->ram->dirty_sync_count = s->dirty_sync_count;
 
         if (blk_mig_active()) {
             info->has_disk = true;