From patchwork Thu Sep 13 15:49:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Cody X-Patchwork-Id: 183683 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9B8AA2C0085 for ; Fri, 14 Sep 2012 02:48:52 +1000 (EST) Received: from localhost ([::1]:46881 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TCCaw-0003F6-Pk for incoming@patchwork.ozlabs.org; Thu, 13 Sep 2012 12:48:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35461) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TCBgr-0003qJ-3D for qemu-devel@nongnu.org; Thu, 13 Sep 2012 11:50:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TCBgk-0005lJ-EG for qemu-devel@nongnu.org; Thu, 13 Sep 2012 11:50:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48977) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TCBgj-0005l6-OS for qemu-devel@nongnu.org; Thu, 13 Sep 2012 11:50:46 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q8DFogXt027800 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 13 Sep 2012 11:50:42 -0400 Received: from localhost (ovpn-112-61.phx2.redhat.com [10.3.112.61]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q8DFodwD030662 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Thu, 13 Sep 2012 11:50:41 -0400 From: Jeff Cody To: qemu-devel@nongnu.org Date: Thu, 13 Sep 2012 11:49:51 -0400 Message-Id: <3583acfcc60f30a05a16ff8c108477faf93f5a36.1347548248.git.jcody@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, pbonzini@redhat.com, stefanha@gmail.com, eblake@redhat.com, supriyak@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH v2 13/16] block: vmdk image file reopen 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 This patch supports reopen for VMDK image files. VMDK extents are added to the existing reopen queue, so that the transactional model of reopen is maintained with multiple image files. Signed-off-by: Jeff Cody --- block/vmdk.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/block/vmdk.c b/block/vmdk.c index bba4c61..426dfc6 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -300,6 +300,50 @@ static int vmdk_is_cid_valid(BlockDriverState *bs) return 1; } +/* Queue extents, if any, for reopen() */ +static int vmdk_reopen_prepare(BDRVReopenState *state, Error **errp) +{ + BDRVVmdkState *s; + int ret = -1; + int i; + VmdkExtent *e; + + assert(state != NULL); + assert(state->bs != NULL); + + if (state->queue == NULL) { + error_set(errp, ERROR_CLASS_GENERIC_ERROR, + "No reopen queue for VMDK extents"); + goto exit; + } + + s = state->bs->opaque; + + assert(s != NULL); + + for (i = 0; i < s->num_extents; i++) { + e = &s->extents[i]; + if (e->file != state->bs->file) { + bdrv_reopen_queue(state->queue, e->file, state->flags); + } + } + ret = 0; + +exit: + return ret; +} + +/* No action for commit, or abort. All VMDK has to do is + * queue the extents for reopen */ +static void vmdk_reopen_commit(BDRVReopenState *state) +{ +} + +static void vmdk_reopen_abort(BDRVReopenState *state) +{ +} + + static int vmdk_parent_open(BlockDriverState *bs) { char *p_name; @@ -1646,6 +1690,9 @@ static BlockDriver bdrv_vmdk = { .instance_size = sizeof(BDRVVmdkState), .bdrv_probe = vmdk_probe, .bdrv_open = vmdk_open, + .bdrv_reopen_prepare = vmdk_reopen_prepare, + .bdrv_reopen_commit = vmdk_reopen_commit, + .bdrv_reopen_abort = vmdk_reopen_abort, .bdrv_read = vmdk_co_read, .bdrv_write = vmdk_co_write, .bdrv_close = vmdk_close,