Commit 735286a4 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20170613' into staging 



migration/next for 20170613

# gpg: Signature made Tue 13 Jun 2017 10:01:45 BST
# gpg:                using RSA key 0xF487EF185872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>"
# gpg:                 aka "Juan Quintela <quintela@trasno.org>"
# Primary key fingerprint: 1899 FF8E DEBF 58CC EE03  4B82 F487 EF18 5872 D723

* remotes/juanquintela/tags/migration/20170613:
  migration: Move migration.h to migration/
  migration: Move remaining exported functions to migration/misc.h
  migration: create global_state.c
  migration: ram_control_* are implemented in qemu_file
  migration: Commands are only used inside migration.c
  migration: Move constants to savevm.h
  migration: Move dump_vmsate_json_to_file() to misc.h
  migration: Split registration functions from vmstate.h
  migration: Move self_announce_delay() to misc.h
  migration: Remove MigrationState from migration_channel_incomming()
  ram: Now POSTCOPY_ACTIVE is the same that STATUS_ACTIVE
  ram: Print block stats also in the complete case
  migration: Don't try to set *errp directly
  migration: isolate return path on src

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents e0b4891a 6666c96a

hw/i386/pc_piix.c

+2 −1
Original line number Diff line number Diff line
@@ -52,7 +52,8 @@ 
#include <xen/hvm/hvm_info_table.h>

#include "hw/xen/xen_pt.h"

#endif

#include "migration/migration.h"

#include "migration/global_state.h"

#include "migration/misc.h"

#include "kvm_i386.h"

#include "sysemu/numa.h"

hw/net/virtio-net.c

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "qapi/qmp/qjson.h"

#include "qapi-event.h"

#include "hw/virtio/virtio-access.h"

#include "migration/misc.h"



#define VIRTIO_NET_VM_VERSION    11

hw/net/vmxnet3.c

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "qemu/bswap.h"

#include "hw/pci/msix.h"

#include "hw/pci/msi.h"

#include "migration/register.h"



#include "vmxnet3.h"

#include "vmxnet_debug.h"

hw/ppc/spapr.c

+3 −1
Original line number Diff line number Diff line
@@ -38,7 +38,9 @@ 
#include "sysemu/cpus.h"

#include "sysemu/hw_accel.h"

#include "kvm_ppc.h"

#include "migration/migration.h"

#include "migration/misc.h"

#include "migration/global_state.h"

#include "migration/register.h"

#include "mmu-hash64.h"

#include "mmu-book3s-v3.h"

#include "qom/cpu.h"

hw/s390x/s390-skeys.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include "hw/s390x/storage-keys.h"

#include "qemu/error-report.h"

#include "sysemu/kvm.h"

#include "migration/register.h"



#define S390_SKEYS_BUFFER_SIZE 131072  /* Room for 128k storage keys */

#define S390_SKEYS_SAVE_FLAG_EOS 0x01