[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v4 3/4] block/parallels: add migration blocker
From: |
Jeff Cody |
Subject: |
[Qemu-block] [PATCH v4 3/4] block/parallels: add migration blocker |
Date: |
Tue, 7 Nov 2017 08:10:35 -0500 |
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: Jeff Cody <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
---
block/parallels.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/block/parallels.c b/block/parallels.c
index 7b7a3ef..9545761 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -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 = {
--
2.9.5
- [Qemu-block] [PATCH v4 0/4] Don't write headers if BDS is INACTIVE, Jeff Cody, 2017/11/07
- [Qemu-block] [PATCH v4 2/4] block/parallels: Do not update header or truncate image when INMIGRATE, Jeff Cody, 2017/11/07
- [Qemu-block] [PATCH v4 1/4] block/vhdx.c: Don't blindly update the header, Jeff Cody, 2017/11/07
- [Qemu-block] [PATCH v4 3/4] block/parallels: add migration blocker,
Jeff Cody <=
- [Qemu-block] [PATCH v4 4/4] qemu-iotests: update unsupported image formats in 194, Jeff Cody, 2017/11/07
- Re: [Qemu-block] [PATCH v4 0/4] Don't write headers if BDS is INACTIVE, Stefan Hajnoczi, 2017/11/09
- Re: [Qemu-block] [PATCH v4 0/4] Don't write headers if BDS is INACTIVE, Denis V. Lunev, 2017/11/09
- Re: [Qemu-block] [PATCH v4 0/4] Don't write headers if BDS is INACTIVE, Max Reitz, 2017/11/14