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

Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20170124b' into staging 



Migration

1 My maintainer change
2 Jianjun's qtailq
3 Ashijeet's only-migratable
4 Zhanghailiang's re-active images
5 Pankaj's change name of migration thread
6 My PCI migration merge
7 Juan's debug to tracing
8 My tracing on save

# gpg: Signature made Tue 24 Jan 2017 18:39:35 GMT
# gpg:                using RSA key 0x0516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A  9FA9 0516 331E BC5B FDE7

* remotes/dgilbert/tags/pull-migration-20170124b:
  migration/tracing: Add tracing on save
  migration: transform remaining DPRINTF into trace_
  PCI/migration merge vmstate_pci_device and vmstate_pcie_device
  migration: Change name of live migration thread
  migration: re-active images while migration been canceled after inactive them
  migration: Fail migration blocker for --only-migratable
  migration: disallow migrate_add_blocker during migration
  migration: Allow "device add" options to only add migratable devices
  migration: Add a new option to enable only-migratable
  block/vvfat: Remove the undesirable comment
  migration: add error_report
  tests/migration: Add test for QTAILQ migration
  migration: migrate QTAILQ
  migration: extend VMStateInfo
  MAINTAINERS: Add myself as a migration submaintainer

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents a9e40460 46a02a74

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1420,6 +1420,7 @@ F: scripts/checkpatch.pl 
Migration

M: Juan Quintela <quintela@redhat.com>

M: Amit Shah <amit.shah@redhat.com>

M: Dr. David Alan Gilbert <dgilbert@redhat.com>

S: Maintained

F: include/migration/

F: migration/

block/qcow.c

+7 −1
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags, 
    unsigned int len, i, shift;

    int ret;

    QCowHeader header;

    Error *local_err = NULL;



    ret = bdrv_pread(bs->file, 0, &header, sizeof(header));

    if (ret < 0) {
@@ -252,7 +253,12 @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags, 
    error_setg(&s->migration_blocker, "The qcow format used by node '%s' "

               "does not support live migration",

               bdrv_get_device_or_node_name(bs));

    migrate_add_blocker(s->migration_blocker);

    ret = migrate_add_blocker(s->migration_blocker, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

        error_free(s->migration_blocker);

        goto fail;

    }



    qemu_co_mutex_init(&s->lock);

    return 0;

block/vdi.c

+7 −1
Original line number Diff line number Diff line
@@ -361,6 +361,7 @@ static int vdi_open(BlockDriverState *bs, QDict *options, int flags, 
    VdiHeader header;

    size_t bmap_size;

    int ret;

    Error *local_err = NULL;



    logout("\n");
@@ -471,7 +472,12 @@ static int vdi_open(BlockDriverState *bs, QDict *options, int flags, 
    error_setg(&s->migration_blocker, "The vdi format used by node '%s' "

               "does not support live migration",

               bdrv_get_device_or_node_name(bs));

    migrate_add_blocker(s->migration_blocker);

    ret = migrate_add_blocker(s->migration_blocker, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

        error_free(s->migration_blocker);

        goto fail_free_bmap;

    }



    qemu_co_mutex_init(&s->write_lock);

block/vhdx.c

+11 −6
Original line number Diff line number Diff line
@@ -991,6 +991,17 @@ static int vhdx_open(BlockDriverState *bs, QDict *options, int flags, 
        }

    }



    /* Disable migration when VHDX images are used */

    error_setg(&s->migration_blocker, "The vhdx format used by node '%s' "

               "does not support live migration",

               bdrv_get_device_or_node_name(bs));

    ret = migrate_add_blocker(s->migration_blocker, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

        error_free(s->migration_blocker);

        goto fail;

    }



    if (flags & BDRV_O_RDWR) {

        ret = vhdx_update_headers(bs, s, false, NULL);

        if (ret < 0) {
@@ -1000,12 +1011,6 @@ static int vhdx_open(BlockDriverState *bs, QDict *options, int flags, 


    /* TODO: differencing files */



    /* Disable migration when VHDX images are used */

    error_setg(&s->migration_blocker, "The vhdx format used by node '%s' "

               "does not support live migration",

               bdrv_get_device_or_node_name(bs));

    migrate_add_blocker(s->migration_blocker);



    return 0;

fail:

    vhdx_close(bs);

block/vmdk.c

+8 −1
Original line number Diff line number Diff line
@@ -941,6 +941,7 @@ static int vmdk_open(BlockDriverState *bs, QDict *options, int flags, 
    int ret;

    BDRVVmdkState *s = bs->opaque;

    uint32_t magic;

    Error *local_err = NULL;



    buf = vmdk_read_desc(bs->file, 0, errp);

    if (!buf) {
@@ -976,7 +977,13 @@ static int vmdk_open(BlockDriverState *bs, QDict *options, int flags, 
    error_setg(&s->migration_blocker, "The vmdk format used by node '%s' "

               "does not support live migration",

               bdrv_get_device_or_node_name(bs));

    migrate_add_blocker(s->migration_blocker);

    ret = migrate_add_blocker(s->migration_blocker, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

        error_free(s->migration_blocker);

        goto fail;

    }



    g_free(buf);

    return 0;