From patchwork Fri Nov 25 18:12:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 127737 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D54FEB6F93 for ; Sat, 26 Nov 2011 05:10:21 +1100 (EST) Received: from localhost ([::1]:54904 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RU0E6-0002Ru-UD for incoming@patchwork.ozlabs.org; Fri, 25 Nov 2011 13:10:18 -0500 Received: from eggs.gnu.org ([140.186.70.92]:47372) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RU0DA-0008QH-9w for qemu-devel@nongnu.org; Fri, 25 Nov 2011 13:09:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RU0D8-0005le-Sb for qemu-devel@nongnu.org; Fri, 25 Nov 2011 13:09:19 -0500 Received: from mx1.redhat.com ([209.132.183.28]:1556) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RU0D8-0005lY-LW for qemu-devel@nongnu.org; Fri, 25 Nov 2011 13:09:18 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id pAPI9HdE013332 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 25 Nov 2011 13:09:17 -0500 Received: from dhcp-5-188.str.redhat.com (vpn1-7-127.ams2.redhat.com [10.36.7.127]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id pAPI95PC000365; Fri, 25 Nov 2011 13:09:16 -0500 From: Kevin Wolf To: anthony@codemonkey.ws Date: Fri, 25 Nov 2011 19:12:10 +0100 Message-Id: <1322244735-12516-8-git-send-email-kwolf@redhat.com> In-Reply-To: <1322244735-12516-1-git-send-email-kwolf@redhat.com> References: <1322244735-12516-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 07/12] vdi: Add migration blocker X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org vdi caches the block map. For migration to work, it would have to be invalidated. Block migration for now. Signed-off-by: Kevin Wolf --- block/vdi.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/block/vdi.c b/block/vdi.c index 684a4a8..7dda522 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 @@ -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)