[Qemu-commits] [qemu/qemu] 48781e: migration: Export migrate_set_state()

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 48781e5bf26a285f43b9c328b668021d28d2e690
      
https://github.com/qemu/qemu/commit/48781e5bf26a285f43b9c328b668021d28d2e690
  Author: zhanghailiang <address@hidden>
  Date:   2016-01-13 (Wed, 13 Jan 2016)

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

  Log Message:
  -----------
  migration: Export migrate_set_state()

Change the first parameter of migrate_set_state(), and export it.
We will use it in a later patch to update incoming state.

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

dgilbert: Updated comment as per Juan's review
Message-Id: <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Reviewed-by: Amit Shah <address@hidden>
Signed-off-by: Amit Shah <address@hidden>


  Commit: 93d7af6ff0243f8a9843a3e8a9362d64c9ab4d4b
      
https://github.com/qemu/qemu/commit/93d7af6ff0243f8a9843a3e8a9362d64c9ab4d4b
  Author: zhanghailiang <address@hidden>
  Date:   2016-01-13 (Wed, 13 Jan 2016)

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

  Log Message:
  -----------
  migration: Add state records for migration incoming

For migration destination, we also need to know its state,
we will use it in COLO.

Here we add a new member 'state' for MigrationIncomingState,
and also use migrate_set_state() to modify its value.

Signed-off-by: zhanghailiang <address@hidden>

dgilbert: Fixed early free of MigraitonIncomingState
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Reviewed-by: Amit Shah <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Amit Shah <address@hidden>


  Commit: 6ba996bb458f4620e62984f2561c270a636bb500
      
https://github.com/qemu/qemu/commit/6ba996bb458f4620e62984f2561c270a636bb500
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2016-01-13 (Wed, 13 Jan 2016)

  Changed paths:
    M migration/savevm.c

  Log Message:
  -----------
  Postcopy: Send events/change state on incoming side

I missed the calls to send migration events on the destination side
as we enter postcopy.
Take care when adding them not to do it after state has been freed.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: zhanghailiang <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Reviewed-by: Amit Shah <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Amit Shah <address@hidden>


  Commit: 4addcd4fdc94c369f4cd54f8e03396ff26fce34d
      
https://github.com/qemu/qemu/commit/4addcd4fdc94c369f4cd54f8e03396ff26fce34d
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2016-01-13 (Wed, 13 Jan 2016)

  Changed paths:
    M docs/qmp-events.txt
    M migration/ram.c
    M qapi/event.json

  Log Message:
  -----------
  Migration: Emit event at start of pass

Emit an event each time we sync the dirty bitmap on the source;
this helps libvirt use postcopy by giving it a kick when it
might be a good idea to start the postcopy.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Amit Shah <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Amit Shah <address@hidden>


  Commit: 063e760a5f52d9b82946956e7046828b524727af
      
https://github.com/qemu/qemu/commit/063e760a5f52d9b82946956e7046828b524727af
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2016-01-13 (Wed, 13 Jan 2016)

  Changed paths:
    M migration/ram.c

  Log Message:
  -----------
  Use qemu_get_buffer_in_place for xbzrle data

Avoid a data copy (if we're lucky) in the xbzrle code.

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


  Commit: c1bc66263c2360d5211ecd18191b0be65b3b54e5
      
https://github.com/qemu/qemu/commit/c1bc66263c2360d5211ecd18191b0be65b3b54e5
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2016-01-13 (Wed, 13 Jan 2016)

  Changed paths:
    M migration/ram.c

  Log Message:
  -----------
  multithread decompression: Avoid one copy

qemu_get_buffer does a copy, we can avoid the memcpy, and
we can then remove the extra buffer.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Liang Li <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Reviewed-by: Amit Shah <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Amit Shah <address@hidden>


  Commit: 91728bda76c1bfe49ac680af763154ec51988732
      
https://github.com/qemu/qemu/commit/91728bda76c1bfe49ac680af763154ec51988732
  Author: Peter Maydell <address@hidden>
  Date:   2016-01-14 (Thu, 14 Jan 2016)

  Changed paths:
    M docs/qmp-events.txt
    M include/migration/migration.h
    M migration/migration.c
    M migration/ram.c
    M migration/savevm.c
    M qapi/event.json

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/amit-migration/tags/migration-for-2.6-1' into staging

migration fixes for postcopy, xbzrle, multithread decompression

# gpg: Signature made Wed 13 Jan 2016 10:34:49 GMT using RSA key ID 854083B6
# gpg: Good signature from "Amit Shah <address@hidden>"
# gpg:                 aka "Amit Shah <address@hidden>"
# gpg:                 aka "Amit Shah <address@hidden>"

* remotes/amit-migration/tags/migration-for-2.6-1:
  multithread decompression: Avoid one copy
  Use qemu_get_buffer_in_place for xbzrle data
  Migration: Emit event at start of pass
  Postcopy: Send events/change state on incoming side
  migration: Add state records for migration incoming
  migration: Export migrate_set_state()

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


Compare: https://github.com/qemu/qemu/compare/649a1bbaf95a...91728bda76c1