From patchwork Fri Jun 15 20:48:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Supriya Kannery X-Patchwork-Id: 165231 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 A824BB704F for ; Sat, 16 Jun 2012 07:22:53 +1000 (EST) Received: from localhost ([::1]:41209 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SfdRx-0005mg-C1 for incoming@patchwork.ozlabs.org; Fri, 15 Jun 2012 16:48:57 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37740) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SfdRa-0005W9-SW for qemu-devel@nongnu.org; Fri, 15 Jun 2012 16:48:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SfdRY-00018j-O7 for qemu-devel@nongnu.org; Fri, 15 Jun 2012 16:48:34 -0400 Received: from e8.ny.us.ibm.com ([32.97.182.138]:38289) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SfdRY-000183-Jx for qemu-devel@nongnu.org; Fri, 15 Jun 2012 16:48:32 -0400 Received: from /spool/local by e8.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 15 Jun 2012 16:48:29 -0400 Received: from d01dlp02.pok.ibm.com (9.56.224.85) by e8.ny.us.ibm.com (192.168.1.108) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 15 Jun 2012 16:48:06 -0400 Received: from d01relay06.pok.ibm.com (d01relay06.pok.ibm.com [9.56.227.116]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 23B606E8051 for ; Fri, 15 Jun 2012 16:48:06 -0400 (EDT) Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay06.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q5FKm5XB32899316 for ; Fri, 15 Jun 2012 16:48:05 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q5FKm48x001742 for ; Fri, 15 Jun 2012 16:48:05 -0400 Received: from skannery.in.ibm.com ([9.79.198.24]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q5FKm1J4001570; Fri, 15 Jun 2012 16:48:02 -0400 From: Supriya Kannery To: qemu-devel@nongnu.org Date: Sat, 16 Jun 2012 02:18:00 +0530 Message-Id: <20120615204800.9853.19740.sendpatchset@skannery.in.ibm.com> In-Reply-To: <20120615204648.9853.1225.sendpatchset@skannery.in.ibm.com> References: <20120615204648.9853.1225.sendpatchset@skannery.in.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12061520-9360-0000-0000-000007626F1A X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.182.138 Cc: Kevin Wolf , Shrinidhi Joshi , Stefan Hajnoczi , Jeff Cody , Luiz Capitulino , Christoph Hellwig Subject: [Qemu-devel] [v1 Patch 5/10]Qemu: raw-posix 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 raw-posix driver changes for bdrv_reopen_xx functions to safely reopen image files. Reopening of image files while changing hostcache dynamically is handled here. Signed-off-by: Supriya Kannery Index: qemu/block/raw.c =================================================================== --- qemu.orig/block/raw.c +++ qemu/block/raw.c @@ -9,6 +9,22 @@ static int raw_open(BlockDriverState *bs return 0; } +static int raw_reopen_prepare(BlockDriverState *bs, BDRVReopenState **prs, + int flags) +{ + return bdrv_reopen_prepare(bs->file, prs, flags); +} + +static void raw_reopen_commit(BlockDriverState *bs, BDRVReopenState *rs) +{ + bdrv_reopen_commit(bs->file, rs); +} + +static void raw_reopen_abort(BlockDriverState *bs, BDRVReopenState *rs) +{ + bdrv_reopen_abort(bs->file, rs); +} + static int coroutine_fn raw_co_readv(BlockDriverState *bs, int64_t sector_num, int nb_sectors, QEMUIOVector *qiov) { @@ -104,6 +120,10 @@ static BlockDriver bdrv_raw = { .instance_size = 1, .bdrv_open = raw_open, + .bdrv_reopen_prepare + = raw_reopen_prepare, + .bdrv_reopen_commit = raw_reopen_commit, + .bdrv_reopen_abort = raw_reopen_abort, .bdrv_close = raw_close, .bdrv_co_readv = raw_co_readv, Index: qemu/block/raw-posix.c =================================================================== --- qemu.orig/block/raw-posix.c +++ qemu/block/raw-posix.c @@ -136,8 +136,15 @@ typedef struct BDRVRawState { #endif } BDRVRawState; +typedef struct BDRVRawReopenState { + BDRVReopenState reopen_state; + BDRVRawState *stash_s; +} BDRVRawReopenState; + static int fd_open(BlockDriverState *bs); static int64_t raw_getlength(BlockDriverState *bs); +static void raw_stash_state(BDRVRawState *stashed_state, BDRVRawState *s); +static void raw_revert_state(BDRVRawState *s, BDRVRawState *stashed_state); #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) static int cdrom_reopen(BlockDriverState *bs); @@ -279,6 +286,119 @@ static int raw_open(BlockDriverState *bs return raw_open_common(bs, filename, flags, 0); } +static int raw_reopen_prepare(BlockDriverState *bs, BDRVReopenState **prs, + int flags) +{ + BDRVRawReopenState *raw_rs = g_malloc0(sizeof(BDRVRawReopenState)); + BDRVRawState *s = bs->opaque; + int ret = 0; + + raw_rs->reopen_state.bs = bs; + + /* stash state before reopen */ + raw_rs->stash_s = g_malloc0(sizeof(BDRVRawState)); +/* memcpy(raw_rs->stash_s, s, sizeof(BDRVRawState)); */ + raw_stash_state(raw_rs->stash_s, s); + s->fd = dup(raw_rs->stash_s->fd); + + *prs = &(raw_rs->reopen_state); + + /* Flags that can be set using fcntl */ + int fcntl_flags = BDRV_O_NOCACHE; + + if ((bs->open_flags & ~fcntl_flags) == (flags & ~fcntl_flags)) { + if ((flags & BDRV_O_NOCACHE)) { + s->open_flags |= O_DIRECT; + } else { + s->open_flags &= ~O_DIRECT; + } + ret = fcntl_setfl(s->fd, s->open_flags); + } else { + + /* close and reopen using new flags */ + bs->drv->bdrv_close(bs); + ret = bs->drv->bdrv_file_open(bs, bs->filename, flags); + } + return ret; +} + +static void raw_reopen_commit(BlockDriverState *bs, BDRVReopenState *rs) +{ + BDRVRawReopenState *raw_rs; + + raw_rs = container_of(rs, BDRVRawReopenState, reopen_state); + + /* clean up stashed state */ + close(raw_rs->stash_s->fd); + g_free(raw_rs->stash_s); + g_free(raw_rs); +} + +static void raw_reopen_abort(BlockDriverState *bs, BDRVReopenState *rs) +{ + BDRVRawReopenState *raw_rs; + BDRVRawState *s = bs->opaque; + + raw_rs = container_of(rs, BDRVRawReopenState, reopen_state); + + /* revert to stashed state */ + if (s->fd != -1) { + close(s->fd); + } +/* memcpy(s, raw_rs->stash_s, sizeof(BDRVRawState)); */ + raw_revert_state(s, raw_rs->stash_s); + g_free(raw_rs->stash_s); + g_free(raw_rs); +} + +static void raw_stash_state(BDRVRawState *stashed_s, BDRVRawState *s) +{ + stashed_s->fd = -1; + stashed_s->type = s->type; + stashed_s->open_flags = s->open_flags; +#if defined(__linux__) + /* linux floppy specific */ + stashed_s->fd_open_time = s->fd_open_time; + stashed_s->fd_error_time = s->fd_error_time; + stashed_s->fd_got_error = s->fd_got_error; + stashed_s->fd_media_changed = s->fd_media_changed; +#endif +#ifdef CONFIG_LINUX_AIO + stashed_s->use_aio = s->use_aio; + stashed_s->aio_ctx = s->aio_ctx; +#endif + stashed_s->aligned_buf = s->aligned_buf; + stashed_s->aligned_buf_size = s->aligned_buf_size; +#ifdef CONFIG_XFS + stashed_s->is_xfs = s->is_xfs; +#endif + +} + +static void raw_revert_state(BDRVRawState *s, BDRVRawState *stashed_s) +{ + + s->fd = stashed_s->fd; + s->type = stashed_s->type; + s->open_flags = stashed_s->open_flags; +#if defined(__linux__) + /* linux floppy specific */ + s->fd_open_time = stashed_s->fd_open_time; + s->fd_error_time = stashed_s->fd_error_time; + s->fd_got_error = stashed_s->fd_got_error; + s->fd_media_changed = stashed_s->fd_media_changed; +#endif +#ifdef CONFIG_LINUX_AIO + s->use_aio = stashed_s->use_aio; + s->aio_ctx = stashed_s->aio_ctx; +#endif + s->aligned_buf = stashed_s->aligned_buf; + s->aligned_buf_size = stashed_s->aligned_buf_size; +#ifdef CONFIG_XFS + s->is_xfs = stashed_s->is_xfs; +#endif +} + /* XXX: use host sector size if necessary with: #ifdef DIOCGSECTORSIZE { @@ -631,6 +751,9 @@ static BlockDriver bdrv_file = { .instance_size = sizeof(BDRVRawState), .bdrv_probe = NULL, /* no probe for protocols */ .bdrv_file_open = raw_open, + .bdrv_reopen_prepare = raw_reopen_prepare, + .bdrv_reopen_commit = raw_reopen_commit, + .bdrv_reopen_abort = raw_reopen_abort, .bdrv_close = raw_close, .bdrv_create = raw_create, .bdrv_co_discard = raw_co_discard,