Commit fe44dc91 authored by Ashijeet Acharya's avatar Ashijeet Acharya Committed by Dr. David Alan Gilbert
Browse files

migration: disallow migrate_add_blocker during migration 



If a migration is already in progress and somebody attempts
to add a migration blocker, this should rightly fail.

Add an errp parameter and a retcode return value to migrate_add_blocker.

Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Signed-off-by: default avatarAshijeet Acharya <ashijeetacharya@gmail.com>
Message-Id: <1484566314-3987-5-git-send-email-ashijeetacharya@gmail.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Acked-by: default avatarGreg Kurz <groug@kaod.org>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
  Merged with recent 'Allow invtsc migration' change
parent a3a3d8c7

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;

block/vpc.c

+8 −3
Original line number Diff line number Diff line
@@ -422,13 +422,18 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags, 
#endif

    }



    qemu_co_mutex_init(&s->lock);



    /* Disable migration when VHD images are used */

    error_setg(&s->migration_blocker, "The vpc 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;