Commit 85182c96 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20190912a' into staging 



Migration pull 2019-09-12

New feature:
  UUID validation check from Yury Kotov

plus a bunch of fixes.

# gpg: Signature made Thu 12 Sep 2019 14:48:28 BST
# gpg:                using RSA key 45F5C71B4A0CB7FB977A9FA90516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>" [full]
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A  9FA9 0516 331E BC5B FDE7

* remotes/dgilbert/tags/pull-migration-20190912a:
  migration: fix one typo in comment of function migration_total_bytes()
  migration/qemu-file: fix potential buf waste for extra buf_index adjustment
  migration/qemu-file: remove check on writev_buffer in qemu_put_compression_data
  migration: Fix postcopy bw for recovery
  tests/migration: Add a test for validate-uuid capability
  tests/libqtest: Allow setting expected exit status
  migration: Add validate-uuid capability
  qemu-file: Rework old qemu_fflush comment
  migration: register_savevm_live doesn't need dev
  hw/net/vmxnet3: Fix leftover unregister_savevm
  migration: cleanup check on ops in savevm.handlers iterations
  migration: multifd_send_thread always post p->sem_sync when error happen

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 3d9442ee 268dcd46

docs/devel/migration.rst

+1 −2
Original line number Diff line number Diff line
@@ -183,8 +183,7 @@ another to load the state back. 


.. code:: c



  int register_savevm_live(DeviceState *dev,

                           const char *idstr,

  int register_savevm_live(const char *idstr,

                           int instance_id,

                           int version_id,

                           SaveVMHandlers *ops,

hw/net/vmxnet3.c

+0 −3
Original line number Diff line number Diff line
@@ -2242,13 +2242,10 @@ static void vmxnet3_instance_init(Object *obj) 


static void vmxnet3_pci_uninit(PCIDevice *pci_dev)

{

    DeviceState *dev = DEVICE(pci_dev);

    VMXNET3State *s = VMXNET3(pci_dev);



    VMW_CBPRN("Starting uninit...");



    unregister_savevm(dev, "vmxnet3-msix", s);



    vmxnet3_net_uninit(s);



    vmxnet3_cleanup_msix(s);

hw/ppc/spapr.c

+1 −1
Original line number Diff line number Diff line
@@ -3078,7 +3078,7 @@ static void spapr_machine_init(MachineState *machine) 
     * interface, this is a legacy from the sPAPREnvironment structure

     * which predated MachineState but had a similar function */

    vmstate_register(NULL, 0, &vmstate_spapr, spapr);

    register_savevm_live(NULL, "spapr/htab", -1, 1,

    register_savevm_live("spapr/htab", -1, 1,

                         &savevm_htab_handlers, spapr);



    qbus_set_hotplug_handler(sysbus_get_default(), OBJECT(machine),

hw/s390x/s390-skeys.c

+1 −1
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ static inline void s390_skeys_set_migration_enabled(Object *obj, bool value, 
    ss->migration_enabled = value;



    if (ss->migration_enabled) {

        register_savevm_live(NULL, TYPE_S390_SKEYS, 0, 1,

        register_savevm_live(TYPE_S390_SKEYS, 0, 1,

                             &savevm_s390_storage_keys, ss);

    } else {

        unregister_savevm(DEVICE(ss), TYPE_S390_SKEYS, ss);

hw/s390x/s390-stattrib.c

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ static void s390_stattrib_instance_init(Object *obj) 
{

    S390StAttribState *sas = S390_STATTRIB(obj);



    register_savevm_live(NULL, TYPE_S390_STATTRIB, 0, 0,

    register_savevm_live(TYPE_S390_STATTRIB, 0, 0,

                         &savevm_s390_stattrib_handlers, sas);



    object_property_add_bool(obj, "migration-enabled",