Received: from eggs.gnu.org ([140.186.70.92]:44232) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKSkq-0005Ao-4P for qemu-devel@nongnu.org; Sun, 30 Oct 2011 06:36:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RKSkp-0002lY-1C for qemu-devel@nongnu.org; Sun, 30 Oct 2011 06:36:40 -0400 Received: from e6.ny.us.ibm.com ([32.97.182.146]:41614) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKSko-0002lU-Qm for qemu-devel@nongnu.org; Sun, 30 Oct 2011 06:36:38 -0400 Received: from /spool/local by e6.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sun, 30 Oct 2011 06:36:33 -0400 Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay05.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p9UAZDMJ256628 for ; Sun, 30 Oct 2011 06:35:13 -0400 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 p9UAZD1I030096 for ; Sun, 30 Oct 2011 08:35:13 -0200 From: Supriya Kannery Date: Sun, 30 Oct 2011 16:05:09 +0530 Message-Id: <20111030103509.31685.87434.sendpatchset@skannery.in.ibm.com> In-Reply-To: <20111030103327.31685.17045.sendpatchset@skannery.in.ibm.com> References: <20111030103327.31685.17045.sendpatchset@skannery.in.ibm.com> Subject: [Qemu-devel] [v8 Patch 5/6]Qemu: Framework for reopening images safely List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , Christoph Hellwig Struct BDRVReopenState along with three reopen related functions introduced for handling reopen state of images safely. This can be extended by each of the block drivers to reopen respective image files. Signed-off-by: Supriya Kannery Index: qemu/block.c =================================================================== --- qemu.orig/block.c +++ qemu/block.c @@ -693,10 +693,32 @@ unlink_and_fail: return ret; } +int bdrv_reopen_prepare(BlockDriverState *bs, BDRVReopenState **prs, int flags) +{ + BlockDriver *drv = bs->drv; + + return drv->bdrv_reopen_prepare(bs, prs, flags); +} + +void bdrv_reopen_commit(BlockDriverState *bs, BDRVReopenState *rs, int flags) +{ + BlockDriver *drv = bs->drv; + + drv->bdrv_reopen_commit(bs, rs, flags); +} + +void bdrv_reopen_abort(BlockDriverState *bs, BDRVReopenState *rs) +{ + BlockDriver *drv = bs->drv; + + drv->bdrv_reopen_abort(bs, rs); +} + int bdrv_reopen(BlockDriverState *bs, int bdrv_flags) { BlockDriver *drv = bs->drv; int ret = 0, open_flags; + BDRVReopenState *rs = NULL; /* Quiesce IO for the given block device */ qemu_aio_flush(); @@ -704,20 +726,35 @@ int bdrv_reopen(BlockDriverState *bs, in qerror_report(QERR_DATA_SYNC_FAILED, bs->device_name); return ret; } - open_flags = bs->open_flags; - bdrv_close(bs); - ret = bdrv_open(bs, bs->filename, bdrv_flags, drv); - if (ret < 0) { - /* Reopen failed. Try to open with original flags */ - qerror_report(QERR_REOPEN_FILE_FAILED, bs->filename); - ret = bdrv_open(bs, bs->filename, open_flags, drv); + /* Use driver specific reopen() if available */ + if (drv->bdrv_reopen_prepare) { + ret = bdrv_reopen_prepare(bs, &rs, bdrv_flags); if (ret < 0) { - /* Reopen failed with orig and modified flags */ - abort(); + bdrv_reopen_abort(bs, rs); + qerror_report(QERR_REOPEN_FILE_FAILED, bs->filename); + return ret; } - } + bdrv_reopen_commit(bs, rs, bdrv_flags); + + } else { + open_flags = bs->open_flags; + bdrv_close(bs); + ret = bdrv_open(bs, bs->filename, bdrv_flags, drv); + if (ret < 0) { + /* Reopen failed. Try to open with original flags */ + qerror_report(QERR_REOPEN_FILE_FAILED, bs->filename); + ret = bdrv_open(bs, bs->filename, open_flags, drv); + if (ret < 0) { + /* + * Reopen failed with orig and modified flags + * For next access to fail, set drv to NULL + */ + bs->drv = NULL; + } + } + } return ret; } Index: qemu/block_int.h =================================================================== --- qemu.orig/block_int.h +++ qemu/block_int.h @@ -55,6 +55,14 @@ struct BlockDriver { int (*bdrv_probe)(const uint8_t *buf, int buf_size, const char *filename); int (*bdrv_probe_device)(const char *filename); int (*bdrv_open)(BlockDriverState *bs, int flags); + + /* For handling image reopen for split or non-split files */ + int (*bdrv_reopen_prepare)(BlockDriverState *bs, BDRVReopenState **rs, + int flags); + void (*bdrv_reopen_commit)(BlockDriverState *bs, BDRVReopenState *rs, + int flags); + void (*bdrv_reopen_abort)(BlockDriverState *bs, BDRVReopenState *rs); + int (*bdrv_file_open)(BlockDriverState *bs, const char *filename, int flags); int (*bdrv_read)(BlockDriverState *bs, int64_t sector_num, uint8_t *buf, int nb_sectors); @@ -211,6 +219,14 @@ struct BlockDriverState { void *private; }; +struct BDRVReopenState { + BlockDriverState *bs; + int reopen_flags; + + /* For raw-posix */ + int reopen_fd; +}; + struct BlockDriverAIOCB { AIOPool *pool; BlockDriverState *bs; Index: qemu/qemu-common.h =================================================================== --- qemu.orig/qemu-common.h +++ qemu/qemu-common.h @@ -202,6 +202,7 @@ typedef struct NICInfo NICInfo; typedef struct HCIInfo HCIInfo; typedef struct AudioState AudioState; typedef struct BlockDriverState BlockDriverState; +typedef struct BDRVReopenState BDRVReopenState; typedef struct DriveInfo DriveInfo; typedef struct DisplayState DisplayState; typedef struct DisplayChangeListener DisplayChangeListener; Index: qemu/block.h =================================================================== --- qemu.orig/block.h +++ qemu/block.h @@ -110,6 +110,9 @@ int bdrv_file_open(BlockDriverState **pb int bdrv_open(BlockDriverState *bs, const char *filename, int flags, BlockDriver *drv); int bdrv_reopen(BlockDriverState *bs, int bdrv_flags); +int bdrv_reopen_prepare(BlockDriverState *bs, BDRVReopenState **prs, int flags); +void bdrv_reopen_commit(BlockDriverState *bs, BDRVReopenState *rs, int flags); +void bdrv_reopen_abort(BlockDriverState *bs, BDRVReopenState *rs); void bdrv_close(BlockDriverState *bs); int bdrv_attach_dev(BlockDriverState *bs, void *dev); void bdrv_attach_dev_nofail(BlockDriverState *bs, void *dev);