OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qcow: Add migration blocker 

qcow caches L2 tables. For migration to work, they would have to be
invalidated. Block migration for now.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2011-11-22 16:44:45 +01:00
parent c3fecea50d
commit fd9f102c3e
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
block/qcow.c
View File

@ -26,6 +26,7 @@
#include "module.h" #include "module.h"
#include <zlib.h> #include <zlib.h>
#include "aes.h" #include "aes.h"
#include "migration.h"
/**************************************************************/ /**************************************************************/
/* QEMU COW block driver with compression and encryption support */ /* QEMU COW block driver with compression and encryption support */
@ -74,6 +75,7 @@ typedef struct BDRVQcowState {
AES_KEY aes_encrypt_key; AES_KEY aes_encrypt_key;
AES_KEY aes_decrypt_key; AES_KEY aes_decrypt_key;
CoMutex lock; CoMutex lock;
Error *migration_blocker;
} BDRVQcowState; } BDRVQcowState;
static int decompress_cluster(BlockDriverState *bs, uint64_t cluster_offset); static int decompress_cluster(BlockDriverState *bs, uint64_t cluster_offset);
@ -160,6 +162,12 @@ static int qcow_open(BlockDriverState *bs, int flags)
bs->backing_file[len] = '\0'; bs->backing_file[len] = '\0';
} }
/* Disable migration when qcow images are used */
error_set(&s->migration_blocker,
QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED,
"qcow", bs->device_name, "live migration");
migrate_add_blocker(s->migration_blocker);
qemu_co_mutex_init(&s->lock); qemu_co_mutex_init(&s->lock);
return 0; return 0;
@ -604,10 +612,14 @@ static int qcow_co_writev(BlockDriverState *bs, int64_t sector_num,
static void qcow_close(BlockDriverState *bs) static void qcow_close(BlockDriverState *bs)
{ {
BDRVQcowState *s = bs->opaque; BDRVQcowState *s = bs->opaque;
g_free(s->l1_table); g_free(s->l1_table);
g_free(s->l2_cache); g_free(s->l2_cache);
g_free(s->cluster_cache); g_free(s->cluster_cache);
g_free(s->cluster_data); g_free(s->cluster_data);
migrate_del_blocker(s->migration_blocker);
error_free(s->migration_blocker);
} }
static int qcow_create(const char *filename, QEMUOptionParameter *options) static int qcow_create(const char *filename, QEMUOptionParameter *options)