From patchwork Mon Jul 30 21:35:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Supriya Kannery X-Patchwork-Id: 174103 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 AFA072C009D for ; Tue, 31 Jul 2012 07:38:55 +1000 (EST) Received: from localhost ([::1]:43003 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Svxfx-0005NW-OK for incoming@patchwork.ozlabs.org; Mon, 30 Jul 2012 17:38:53 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38273) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Svxfl-0005GH-NY for qemu-devel@nongnu.org; Mon, 30 Jul 2012 17:38:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Svxfk-0003ON-J3 for qemu-devel@nongnu.org; Mon, 30 Jul 2012 17:38:41 -0400 Received: from e8.ny.us.ibm.com ([32.97.182.138]:33613) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Svxfk-0003O6-Es for qemu-devel@nongnu.org; Mon, 30 Jul 2012 17:38:40 -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 ; Mon, 30 Jul 2012 17:38:39 -0400 Received: from d01dlp03.pok.ibm.com (9.56.224.17) by e8.ny.us.ibm.com (192.168.1.108) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 30 Jul 2012 17:38:36 -0400 Received: from d01relay05.pok.ibm.com (d01relay05.pok.ibm.com [9.56.227.237]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id 36521C9002E for ; Mon, 30 Jul 2012 17:38:34 -0400 (EDT) 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 q6ULa1RD363952 for ; Mon, 30 Jul 2012 17:36:01 -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 q6ULa11o011056 for ; Mon, 30 Jul 2012 18:36:01 -0300 Received: from skannery.in.ibm.com ([9.79.207.23]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q6ULZwIU010259; Mon, 30 Jul 2012 18:35:58 -0300 From: Supriya Kannery To: qemu-devel@nongnu.org Date: Tue, 31 Jul 2012 03:05:57 +0530 Message-Id: <20120730213557.21536.55630.sendpatchset@skannery.in.ibm.com> In-Reply-To: <20120730213409.21536.7589.sendpatchset@skannery.in.ibm.com> References: <20120730213409.21536.7589.sendpatchset@skannery.in.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12073021-9360-0000-0000-000008ECE4B5 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] [v2 Patch 7/9]block: qed 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 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; @@ -1560,6 +1660,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,