[Qemu-devel] [PULL 00/14] Migration PULL request

[Juan Quintela]

Hi

This pull request includes:
- don't set errp directly (eduardo)
- isolate return path (peter)
- rest of consistent output series
- 10 first patches of the misc cleanup series

Please, apply.

Thanks, Juan.

The following changes since commit 9bba618f18b1a60a3f2668db82b453f6cd9467c0:

  Merge remote-tracking branch 'remotes/elmarco/tags/char-pull-request' into 
staging (2017-06-12 19:26:49 +0100)

are available in the git repository at:

  git://github.com/juanquintela/qemu.git tags/migration/20170613

for you to fetch changes up to 6666c96aac9151568736226dec99aa8acb14d07c:

  migration: Move migration.h to migration/ (2017-06-13 11:00:45 +0200)

----------------------------------------------------------------
migration/next for 20170613

----------------------------------------------------------------
Eduardo Habkost (1):
      migration: Don't try to set *errp directly

Juan Quintela (12):
      ram: Print block stats also in the complete case
      ram: Now POSTCOPY_ACTIVE is the same that STATUS_ACTIVE
      migration: Remove MigrationState from migration_channel_incomming()
      migration: Move self_announce_delay() to misc.h
      migration: Split registration functions from vmstate.h
      migration: Move dump_vmsate_json_to_file() to misc.h
      migration: Move constants to savevm.h
      migration: Commands are only used inside migration.c
      migration: ram_control_* are implemented in qemu_file
      migration: create global_state.c
      migration: Move remaining exported functions to migration/misc.h
      migration: Move migration.h to migration/

Peter Xu (1):
      migration: isolate return path on src

 hw/i386/pc_piix.c                            |   3 +-
 hw/net/virtio-net.c                          |   1 +
 hw/net/vmxnet3.c                             |   1 +
 hw/ppc/spapr.c                               |   4 +-
 hw/s390x/s390-skeys.c                        |   1 +
 hw/s390x/s390-virtio-ccw.c                   |   1 +
 hw/xen/xen-common.c                          |   3 +-
 include/migration/global_state.h             |  25 +++
 include/migration/misc.h                     |  26 +++
 include/migration/register.h                 |  56 +++++++
 include/migration/vmstate.h                  |  50 ------
 migration/Makefile.objs                      |   2 +-
 migration/block.c                            |   3 +-
 migration/channel.c                          |   7 +-
 migration/channel.h                          |   3 +-
 migration/colo-comm.c                        |   2 +-
 migration/colo.c                             |   2 +-
 migration/exec.c                             |   4 +-
 migration/fd.c                               |   4 +-
 migration/global_state.c                     | 140 +++++++++++++++++
 migration/migration.c                        | 226 ++++++---------------------
 {include/migration => migration}/migration.h |  65 --------
 migration/postcopy-ram.c                     |   2 +-
 migration/qemu-file.c                        |   2 +-
 migration/qemu-file.h                        |  17 ++
 migration/ram.c                              |   3 +-
 migration/rdma.c                             |   2 +-
 migration/savevm.c                           |   5 +-
 migration/savevm.h                           |  15 ++
 migration/socket.c                           |   5 +-
 migration/tls.c                              |   4 +-
 migration/trace-events                       |   4 +-
 migration/vmstate-types.c                    |   2 +-
 migration/vmstate.c                          |   3 +-
 qdev-monitor.c                               |   2 +-
 slirp/slirp.c                                |   1 +
 tests/test-vmstate.c                         |   3 +-
 ui/spice-core.c                              |   2 +-
 vl.c                                         |   2 +-
 39 files changed, 380 insertions(+), 323 deletions(-)
 create mode 100644 include/migration/global_state.h
 create mode 100644 include/migration/register.h
 create mode 100644 migration/global_state.c
 rename {include/migration => migration}/migration.h (63%)