From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:59332) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RPFyM-0002ag-Ql for qemu-devel@nongnu.org; Sat, 12 Nov 2011 10:58:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RPFyA-0007Gc-V7 for qemu-devel@nongnu.org; Sat, 12 Nov 2011 10:58:26 -0500 Received: from e5.ny.us.ibm.com ([32.97.182.145]:38625) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RPFy9-0007Fj-Kw for qemu-devel@nongnu.org; Sat, 12 Nov 2011 10:58:14 -0500 Received: from /spool/local by e5.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sat, 12 Nov 2011 10:58:03 -0500 Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay06.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id pACFvoPe3444806 for ; Sat, 12 Nov 2011 10:57:50 -0500 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id pACFvoQL022327 for ; Sat, 12 Nov 2011 13:57:50 -0200 From: Anthony Liguori Date: Sat, 12 Nov 2011 09:57:39 -0600 Message-Id: <1321113459-3331-7-git-send-email-aliguori@us.ibm.com> In-Reply-To: <1321113459-3331-1-git-send-email-aliguori@us.ibm.com> References: <1321113459-3331-1-git-send-email-aliguori@us.ibm.com> Subject: [Qemu-devel] [PATCH 7/7] qcow2: relax migration blocker List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Lucas Meneghel Rodrigues , Anthony Liguori , Stefan Hajnoczi , Juan Quintela , Avi Kivity Only block migration if we're using encrypted files. Signed-off-by: Anthony Liguori --- block/qcow2.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index b5171e0..8071f2c 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -279,10 +279,12 @@ static int qcow2_open(BlockDriverState *bs, int flags) goto fail; } - error_set(&s->migration_blocker, - QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED, - "qcow2", bs->device_name, "live migration"); - migrate_add_blocker(s->migration_blocker); + if (bs->encrypted) { + error_set(&s->migration_blocker, + QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED, + "qcow2", bs->device_name, "live migration"); + migrate_add_blocker(s->migration_blocker); + } /* Initialise locks */ qemu_co_mutex_init(&s->lock); @@ -628,8 +630,10 @@ static void qcow2_close(BlockDriverState *bs) BDRVQcowState *s = bs->opaque; g_free(s->l1_table); - migrate_del_blocker(s->migration_blocker); - error_free(s->migration_blocker); + if (s->migration_blocker) { + migrate_del_blocker(s->migration_blocker); + error_free(s->migration_blocker); + } qcow2_cache_flush(bs, s->l2_table_cache); qcow2_cache_flush(bs, s->refcount_block_cache); -- 1.7.4.1