[Qemu-commits] [qemu/qemu] 114f5a: ram: Unfold get_xbzrle_cache_stats() into populate...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 114f5aee02e7d815c2241c46d9f9d1c939b1f7d3
      
https://github.com/qemu/qemu/commit/114f5aee02e7d815c2241c46d9f9d1c939b1f7d3
  Author: Juan Quintela <address@hidden>
  Date:   2017-06-07 (Wed, 07 Jun 2017)

  Changed paths:
    M migration/migration.c

  Log Message:
  -----------
  ram: Unfold get_xbzrle_cache_stats() into populate_ram_info()

They were called consecutively always.

Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 338182c83c38f6c13731a98e487e7ba3cda6a615
      
https://github.com/qemu/qemu/commit/338182c83c38f6c13731a98e487e7ba3cda6a615
  Author: Juan Quintela <address@hidden>
  Date:   2017-06-07 (Wed, 07 Jun 2017)

  Changed paths:
    M migration/migration.c

  Log Message:
  -----------
  ram: We only print throttling information sometimes

Change it to be consistent with everything else.

Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 83c13382e43c4ce157ee26b6d0a6d1db801df78b
      
https://github.com/qemu/qemu/commit/83c13382e43c4ce157ee26b6d0a6d1db801df78b
  Author: Juan Quintela <address@hidden>
  Date:   2017-06-07 (Wed, 07 Jun 2017)

  Changed paths:
    M migration/migration.c
    M migration/ram.c
    M migration/ram.h

  Log Message:
  -----------
  ram: Call migration_page_queue_free() at ram_migration_cleanup()

We shouldn't be using memory later than that.

Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Peter Xu <address@hidden>


  Commit: c00e0928321914e693cf7f5838704612531340a7
      
https://github.com/qemu/qemu/commit/c00e0928321914e693cf7f5838704612531340a7
  Author: Juan Quintela <address@hidden>
  Date:   2017-06-07 (Wed, 07 Jun 2017)

  Changed paths:
    M migration/ram.c

  Log Message:
  -----------
  ram: Move ZERO_TARGET_PAGE inside XBZRLE

It was only used by XBZRLE anyways.

Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Peter Xu <address@hidden>


  Commit: 9360447d34f17ce5680242e2687e2e4ba9182634
      
https://github.com/qemu/qemu/commit/9360447d34f17ce5680242e2687e2e4ba9182634
  Author: Juan Quintela <address@hidden>
  Date:   2017-06-07 (Wed, 07 Jun 2017)

  Changed paths:
    M migration/migration.c
    M migration/ram.c
    M migration/ram.h

  Log Message:
  -----------
  ram: Use MigrationStats for statistics

RAM Statistics need to survive migration to make info migrate work, so we
need to store them outside of RAMState.  As we already have an struct
with those fields, just used them. (MigrationStats and XBZRLECacheStats).

Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Peter Xu <address@hidden>


  Commit: 53518d9448068290116bee7c3943ff6edda2b3f3
      
https://github.com/qemu/qemu/commit/53518d9448068290116bee7c3943ff6edda2b3f3
  Author: Juan Quintela <address@hidden>
  Date:   2017-06-07 (Wed, 07 Jun 2017)

  Changed paths:
    M migration/ram.c

  Log Message:
  -----------
  ram: Make RAMState dynamic

We create the variable while we are at migration and we remove it
after migration.

Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>


  Commit: eefff991d059d299b917627d2a95bce34d2f97f3
      
https://github.com/qemu/qemu/commit/eefff991d059d299b917627d2a95bce34d2f97f3
  Author: QingFeng Hao <address@hidden>
  Date:   2017-06-07 (Wed, 07 Jun 2017)

  Changed paths:
    M migration/savevm.c

  Log Message:
  -----------
  qemu/migration: fix the double free problem on from_src_file

In load_snapshot, mis->from_src_file is freed twice, the first free is by
qemu_fclose, the second is by migration_incoming_state_destroy and
it causes Illegal instruction exception. The fix is just to remove the
first free.

This problem is found by qemu-iotests case 068 since commit
"660819b migration: shut src return path unconditionally". The error is:
068 1s ... - output mismatch (see 068.out.bad)
    --- tests/qemu-iotests/068.out      2017-05-06 01:00:26.417270437 +0200
    +++ 068.out.bad     2017-06-03 13:59:55.360274640 +0200
    @@ -6,6 +6,8 @@
     QEMU X.Y.Z monitor - type 'help' for more information
     (qemu) savevm 0
     (qemu) quit
    +./common.config: line 107: 242472 Illegal instruction     (core dumped) ( 
if [ -n "${QEMU_NEED_PID}" ]; then
    +    echo $BASHPID > "${QEMU_TEST_DIR}/qemu-${_QEMU_HANDLE}.pid";
    +fi; exec "$QEMU_PROG" $QEMU_OPTIONS "$@" )
     QEMU X.Y.Z monitor - type 'help' for more information
    -(qemu) quit
    -*** done
    +(qemu) *** done

Signed-off-by: QingFeng Hao <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: b55a69fe5f0a504dac6359bb7e99a72b130c3661
      
https://github.com/qemu/qemu/commit/b55a69fe5f0a504dac6359bb7e99a72b130c3661
  Author: Peter Maydell <address@hidden>
  Date:   2017-06-07 (Wed, 07 Jun 2017)

  Changed paths:
    M migration/migration.c
    M migration/ram.c
    M migration/ram.h
    M migration/savevm.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20170607' 
into staging

migration/next for 20170607

# gpg: Signature made Wed 07 Jun 2017 10:02:01 BST
# gpg:                using RSA key 0xF487EF185872D723
# gpg: Good signature from "Juan Quintela <address@hidden>"
# gpg:                 aka "Juan Quintela <address@hidden>"
# Primary key fingerprint: 1899 FF8E DEBF 58CC EE03  4B82 F487 EF18 5872 D723

* remotes/juanquintela/tags/migration/20170607:
  qemu/migration: fix the double free problem on from_src_file
  ram: Make RAMState dynamic
  ram: Use MigrationStats for statistics
  ram: Move ZERO_TARGET_PAGE inside XBZRLE
  ram: Call migration_page_queue_free() at ram_migration_cleanup()
  ram: We only print throttling information sometimes
  ram: Unfold get_xbzrle_cache_stats() into populate_ram_info()

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/0db1851becbe...b55a69fe5f0a