From patchwork Mon May 17 10:19:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: MORITA Kazutaka X-Patchwork-Id: 52773 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A596CB7DAE for ; Mon, 17 May 2010 20:06:29 +1000 (EST) Received: from localhost ([127.0.0.1]:36167 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ODxDN-0001WI-Tc for incoming@patchwork.ozlabs.org; Mon, 17 May 2010 06:06:26 -0400 Received: from [140.186.70.92] (port=56377 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ODx9o-0000Nn-5j for qemu-devel@nongnu.org; Mon, 17 May 2010 06:02:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1ODx9i-0004dV-4P for qemu-devel@nongnu.org; Mon, 17 May 2010 06:02:44 -0400 Received: from sh.osrg.net ([192.16.179.4]:35195) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1ODx9h-0004cG-KM for qemu-devel@nongnu.org; Mon, 17 May 2010 06:02:38 -0400 Received: from fs.osrg.net (postfix@fs.osrg.net [10.0.0.12]) by sh.osrg.net (8.14.3/8.14.3/OSRG-NET) with ESMTP id o4HA1pwo004108; Mon, 17 May 2010 19:01:52 +0900 Received: from localhost (dfs1401.osrg.net [10.68.14.1]) by fs.osrg.net (Postfix) with ESMTP id E00843E02F0; Mon, 17 May 2010 19:01:51 +0900 (JST) From: MORITA Kazutaka To: avi@redhat.com, aliguori@us.ibm.com, kwolf@redhat.com, hch@lst.de Date: Mon, 17 May 2010 19:19:47 +0900 Message-Id: <1274091589-19991-2-git-send-email-morita.kazutaka@lab.ntt.co.jp> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1273830676-2349-1-git-send-email-morita.kazutaka@lab.ntt.co.jp> References: <1273830676-2349-1-git-send-email-morita.kazutaka@lab.ntt.co.jp> X-Dispatcher: imput version 20070423(IM149) Lines: 60 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Mon, 17 May 2010 19:01:54 +0900 (JST) X-Virus-Scanned: clamav-milter 0.96 at sh X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: fujita.tomonori@lab.ntt.co.jp, sheepdog@lists.wpkg.org, qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [Qemu-devel] [RFC PATCH v3 1/3] close all the block drivers before the qemu process exits X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This patch calls the close handler of the block driver before the qemu process exits. This is necessary because the sheepdog block driver releases the lock of VM images in the close handler. Signed-off-by: MORITA Kazutaka --- block.c | 9 +++++++++ block.h | 1 + vl.c | 1 + 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/block.c b/block.c index bfe46e3..f3bf3f2 100644 --- a/block.c +++ b/block.c @@ -636,6 +636,15 @@ void bdrv_close(BlockDriverState *bs) } } +void bdrv_close_all(void) +{ + BlockDriverState *bs; + + QTAILQ_FOREACH(bs, &bdrv_states, list) { + bdrv_close(bs); + } +} + void bdrv_delete(BlockDriverState *bs) { /* remove from list, if necessary */ diff --git a/block.h b/block.h index 278259c..531e802 100644 --- a/block.h +++ b/block.h @@ -121,6 +121,7 @@ BlockDriverAIOCB *bdrv_aio_ioctl(BlockDriverState *bs, /* Ensure contents are flushed to disk. */ void bdrv_flush(BlockDriverState *bs); void bdrv_flush_all(void); +void bdrv_close_all(void); int bdrv_has_zero_init(BlockDriverState *bs); int bdrv_is_allocated(BlockDriverState *bs, int64_t sector_num, int nb_sectors, diff --git a/vl.c b/vl.c index 85bcc84..5ce7807 100644 --- a/vl.c +++ b/vl.c @@ -2007,6 +2007,7 @@ static void main_loop(void) exit(0); } } + bdrv_close_all(); pause_all_vcpus(); }