Commit 1d0f37cf authored by Jeff Cody's avatar Jeff Cody Committed by Max Reitz
Browse files

block/parallels: add migration blocker 



Migration does not work for parallels, and has been broken for a while
(see patch 'block/parallels: Do not update header or truncate image when
 INMIGRATE').  The bdrv_invalidate_cache() method needs to be added for
migration to be supported.  Until this is done, prohibit migration.

Signed-off-by: default avatarJeff Cody <jcody@redhat.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Message-id: 5e04a7c8a3089913fa58d484af42dab7993984ad.1510059970.git.jcody@redhat.com
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 6c7d390b

block/parallels.c

+15 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include "qemu/module.h"

#include "qemu/bswap.h"

#include "qemu/bitmap.h"

#include "migration/blocker.h"



/**************************************************************/
@@ -100,6 +101,7 @@ typedef struct BDRVParallelsState { 
    unsigned int tracks;



    unsigned int off_multiplier;

    Error *migration_blocker;

} BDRVParallelsState;
@@ -720,6 +722,16 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, 
    s->bat_dirty_bmap =

        bitmap_new(DIV_ROUND_UP(s->header_size, s->bat_dirty_block));



    /* Disable migration until bdrv_invalidate_cache method is added */

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

    }

    qemu_co_mutex_init(&s->lock);

    return 0;
@@ -750,6 +762,9 @@ static void parallels_close(BlockDriverState *bs) 


    g_free(s->bat_dirty_bmap);

    qemu_vfree(s->header);



    migrate_del_blocker(s->migration_blocker);

    error_free(s->migration_blocker);

}



static QemuOptsList parallels_create_opts = {