Commit beff47a2 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Migration Pull request

It includes several fixes:

- fix qemu_fclose(denis)
- remove superfluous breaks (liao)
- fix memory leak (zheng)

Please apply

[v1 & v2]

There was one error on the huawei address of the 1st patch and mail
was bouncing.  Fixed.

# gpg: Signature made Mon 13 Jul 2020 18:51:34 BST
# gpg:                using RSA key 1899FF8EDEBF58CCEE034B82F487EF185872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>" [full]
# gpg:                 aka "Juan Quintela <quintela@trasno.org>" [full]
# Primary key fingerprint: 1899 FF8E DEBF 58CC EE03  4B82 F487 EF18 5872 D723

* remotes/juanquintela/tags/migration-pull-request:
  migration/migration.c: Remove superfluous breaks
  migration/savevm: respect qemu_fclose() error code in save_snapshot()
  migration: fix memory leak in qmp_migrate_set_parameters

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 1a53dfee eb9bd46f

migration/migration.c

+2 −4
Original line number Diff line number Diff line
@@ -986,7 +986,6 @@ static void fill_source_migration_info(MigrationInfo *info) 
        /* no migration has happened ever */

        /* do not overwrite destination migration status */

        return;

        break;

    case MIGRATION_STATUS_SETUP:

        info->has_status = true;

        info->has_total_time = false;
@@ -1105,7 +1104,6 @@ static void fill_destination_migration_info(MigrationInfo *info) 
    switch (mis->state) {

    case MIGRATION_STATUS_NONE:

        return;

        break;

    case MIGRATION_STATUS_SETUP:

    case MIGRATION_STATUS_CANCELLING:

    case MIGRATION_STATUS_CANCELLED:
@@ -1343,12 +1341,12 @@ static void migrate_params_test_apply(MigrateSetParameters *params, 


    if (params->has_tls_creds) {

        assert(params->tls_creds->type == QTYPE_QSTRING);

        dest->tls_creds = g_strdup(params->tls_creds->u.s);

        dest->tls_creds = params->tls_creds->u.s;

    }



    if (params->has_tls_hostname) {

        assert(params->tls_hostname->type == QTYPE_QSTRING);

        dest->tls_hostname = g_strdup(params->tls_hostname->u.s);

        dest->tls_hostname = params->tls_hostname->u.s;

    }



    if (params->has_max_bandwidth) {

migration/savevm.c

+6 −2
Original line number Diff line number Diff line
@@ -2635,7 +2635,7 @@ int save_snapshot(const char *name, Error **errp) 
{

    BlockDriverState *bs, *bs1;

    QEMUSnapshotInfo sn1, *sn = &sn1, old_sn1, *old_sn = &old_sn1;

    int ret = -1;

    int ret = -1, ret2;

    QEMUFile *f;

    int saved_vm_running;

    uint64_t vm_state_size;
@@ -2719,10 +2719,14 @@ int save_snapshot(const char *name, Error **errp) 
    }

    ret = qemu_savevm_state(f, errp);

    vm_state_size = qemu_ftell(f);

    qemu_fclose(f);

    ret2 = qemu_fclose(f);

    if (ret < 0) {

        goto the_end;

    }

    if (ret2 < 0) {

        ret = ret2;

        goto the_end;

    }



    /* The bdrv_all_create_snapshot() call that follows acquires the AioContext

     * for itself.  BDRV_POLL_WHILE() does not support nested locking because