aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2011-11-22 16:46:26 +0100
committerKevin Wolf <kwolf@redhat.com>2011-11-23 17:04:02 +0100
commitfc9d106c8dfe1c4afe0e127dfcd2764e63f0efb0 (patch)
treeb0eeefbc8b6a82492dcc721546fdb13cbc0b42ee /block/vdi.c
parentqcow: Add migration blocker (diff)
downloadqemu-kvm-fc9d106c8dfe1c4afe0e127dfcd2764e63f0efb0.tar.gz
qemu-kvm-fc9d106c8dfe1c4afe0e127dfcd2764e63f0efb0.tar.bz2
qemu-kvm-fc9d106c8dfe1c4afe0e127dfcd2764e63f0efb0.zip
vdi: Add migration blocker
vdi caches the block map. For migration to work, it would have to be invalidated. Block migration for now. Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/vdi.c')
-rw-r--r--block/vdi.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/block/vdi.c b/block/vdi.c
index 684a4a87b..7dda5222e 100644
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -52,6 +52,7 @@
#include "qemu-common.h"
#include "block_int.h"
#include "module.h"
+#include "migration.h"
#if defined(CONFIG_UUID)
#include <uuid/uuid.h>
@@ -203,6 +204,8 @@ typedef struct {
uint32_t bmap_sector;
/* VDI header (converted to host endianness). */
VdiHeader header;
+
+ Error *migration_blocker;
} BDRVVdiState;
/* Change UUID from little endian (IPRT = VirtualBox format) to big endian
@@ -454,6 +457,12 @@ static int vdi_open(BlockDriverState *bs, int flags)
goto fail_free_bmap;
}
+ /* Disable migration when vdi images are used */
+ error_set(&s->migration_blocker,
+ QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED,
+ "vdi", bs->device_name, "live migration");
+ migrate_add_blocker(s->migration_blocker);
+
return 0;
fail_free_bmap:
@@ -939,6 +948,9 @@ static int vdi_create(const char *filename, QEMUOptionParameter *options)
static void vdi_close(BlockDriverState *bs)
{
+ BDRVVdiState *s = bs->opaque;
+ migrate_del_blocker(s->migration_blocker);
+ error_free(s->migration_blocker);
}
static coroutine_fn int vdi_co_flush(BlockDriverState *bs)