From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37940) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SfdSU-0007bu-Mr for qemu-devel@nongnu.org; Fri, 15 Jun 2012 16:49:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SfdSS-0001Vx-Ob for qemu-devel@nongnu.org; Fri, 15 Jun 2012 16:49:30 -0400 Received: from e1.ny.us.ibm.com ([32.97.182.141]:57111) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SfdSS-0001V7-Js for qemu-devel@nongnu.org; Fri, 15 Jun 2012 16:49:28 -0400 Received: from /spool/local by e1.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 15 Jun 2012 16:49:25 -0400 Received: from d01relay06.pok.ibm.com (d01relay06.pok.ibm.com [9.56.227.116]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id DE85D38C805E for ; Fri, 15 Jun 2012 16:49:21 -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 q5FKnLIU31064278 for ; Fri, 15 Jun 2012 16:49:21 -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 q5FKnLb8006869 for ; Fri, 15 Jun 2012 16:49:21 -0400 From: Supriya Kannery Date: Sat, 16 Jun 2012 02:19:12 +0530 Message-Id: <20120615204912.9853.7310.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> Subject: [Qemu-devel] [v1 Patch 10/10]Qemu: qed image file reopen List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Shrinidhi Joshi , Stefan Hajnoczi , Jeff Cody , Luiz Capitulino , Christoph Hellwig qed 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/qed.c =================================================================== --- qemu.orig/block/qed.c +++ qemu/block/qed.c @@ -18,6 +18,14 @@ #include "qerror.h" #include "migration.h" +typedef struct BDRVQEDReopenState { + BDRVReopenState reopen_state; + BDRVQEDState *stash_s; +} BDRVQEDReopenState; + +static void qed_stash_state(BDRVQEDState *stashed_state, BDRVQEDState *s); +static void qed_revert_state(BDRVQEDState *s, BDRVQEDState *stashed_state); + static void qed_aio_cancel(BlockDriverAIOCB *blockacb) { QEDAIOCB *acb = (QEDAIOCB *)blockacb; @@ -512,6 +520,98 @@ out: return ret; } +static int bdrv_qed_reopen_prepare(BlockDriverState *bs, BDRVReopenState **prs, + int flags) +{ + BDRVQEDReopenState *qed_rs = g_malloc0(sizeof(BDRVQEDReopenState)); + int ret = 0; + BDRVQEDState *s = bs->opaque; + + qed_rs->reopen_state.bs = bs; + + /* save state before reopen */ + qed_rs->stash_s = g_malloc0(sizeof(BDRVQEDState)); + qed_stash_state(qed_rs->stash_s, s); + *prs = &(qed_rs->reopen_state); + + /* Reopen file with new flags */ + ret = bdrv_qed_open(bs, flags); + return ret; +} + +static void bdrv_qed_reopen_commit(BlockDriverState *bs, BDRVReopenState *rs) +{ + BDRVQEDReopenState *qed_rs; + BDRVQEDState *stashed_s; + + qed_rs = container_of(rs, BDRVQEDReopenState, reopen_state); + stashed_s = qed_rs->stash_s; + + qed_cancel_need_check_timer(stashed_s); + qemu_free_timer(stashed_s->need_check_timer); + + qed_free_l2_cache(&stashed_s->l2_cache); + qemu_vfree(stashed_s->l1_table); + + g_free(stashed_s); + g_free(qed_rs); +} + +static void bdrv_qed_reopen_abort(BlockDriverState *bs, BDRVReopenState *rs) +{ + BDRVQEDReopenState *qed_rs; + BDRVQEDState *s = bs->opaque; + BDRVQEDState *stashed_s; + + qed_rs = container_of(rs, BDRVQEDReopenState, reopen_state); + + /* Revert to stashed state */ + qed_revert_state(s, qed_rs->stash_s); + stashed_s = qed_rs->stash_s; + + g_free(stashed_s); + g_free(qed_rs); +} + +static void qed_stash_state(BDRVQEDState *stashed_state, BDRVQEDState *s) +{ + stashed_state->bs = s->bs; + stashed_state->file_size = s->file_size; + + stashed_state->header = s->header; + stashed_state->l1_table = s->l1_table; + stashed_state->l2_cache = s->l2_cache; + stashed_state->table_nelems = s->table_nelems; + stashed_state->l1_shift = s->l1_shift; + stashed_state->l2_shift = s->l2_shift; + stashed_state->l2_mask = s->l2_mask; + + stashed_state->allocating_write_reqs = s->allocating_write_reqs; + stashed_state->allocating_write_reqs_plugged = + s->allocating_write_reqs_plugged; + + stashed_state->need_check_timer = s->need_check_timer; +} + +static void qed_revert_state(BDRVQEDState *s, BDRVQEDState *stashed_state) +{ + s->bs = stashed_state->bs; + s->file_size = stashed_state->file_size; + + s->header = stashed_state->header; + s->l1_table = stashed_state->l1_table; + s->l2_cache = stashed_state->l2_cache; + s->table_nelems = stashed_state->table_nelems; + s->l1_shift = stashed_state->l1_shift; + s->l2_shift = stashed_state->l2_shift; + s->l2_mask = stashed_state->l2_mask; + + s->allocating_write_reqs = s->allocating_write_reqs; + s->allocating_write_reqs_plugged = s->allocating_write_reqs_plugged; + + s->need_check_timer = s->need_check_timer; +} + static void bdrv_qed_close(BlockDriverState *bs) { BDRVQEDState *s = bs->opaque; @@ -1559,6 +1659,9 @@ static BlockDriver bdrv_qed = { .bdrv_rebind = bdrv_qed_rebind, .bdrv_open = bdrv_qed_open, .bdrv_close = bdrv_qed_close, + .bdrv_reopen_prepare = bdrv_qed_reopen_prepare, + .bdrv_reopen_commit = bdrv_qed_reopen_commit, + .bdrv_reopen_abort = bdrv_qed_reopen_abort, .bdrv_create = bdrv_qed_create, .bdrv_co_is_allocated = bdrv_qed_co_is_allocated, .bdrv_make_empty = bdrv_qed_make_empty,