From patchwork Fri Jul 20 19:32:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Benoit Canet X-Patchwork-Id: 172347 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 E34412C0339 for ; Sat, 21 Jul 2012 07:05:13 +1000 (EST) Received: from localhost ([::1]:53467 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsKNr-0002QF-Ui for incoming@patchwork.ozlabs.org; Fri, 20 Jul 2012 17:05:11 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40597) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsIyE-0007Ho-52 for qemu-devel@nongnu.org; Fri, 20 Jul 2012 15:36:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SsIwN-0002XQ-GU for qemu-devel@nongnu.org; Fri, 20 Jul 2012 15:34:38 -0400 Received: from mail-we0-f173.google.com ([74.125.82.173]:35320) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsIwN-0002Vt-A7 for qemu-devel@nongnu.org; Fri, 20 Jul 2012 15:32:43 -0400 Received: by weyz53 with SMTP id z53so2920397wey.4 for ; Fri, 20 Jul 2012 12:32:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=5nZgxCOAWwLtFqrmUGB2N2Zi69YFVUPJGjsPNf2eifQ=; b=ztOuE5h/jeW1XC0S8EqIfHmL+3fTIgYPBHC2j51NPTLMKsVRt29OdoohB09s8LnKko zRrF+opyjPCtt7hnpsxImCyVReLf1KCl/E1o6/xCmwiDEmgw5v1Rcn9hmbgYQwPd3PCt NS1pqAE9pexK756hTkS66yzfLH1tZzufRHypujqKt0VSNrePTHxZiQIrJmXN1bB4wRNa UOlcLgWHZwz9Qaq7teExU1YDKN9VU7XG+vN/2dMZLi41O7RQD7cOCUCahkItTVxRVP+j KUt52cpjJ5BfOMW5Lq/7LuktLU7V63zr+q1HaehF5Q4mAXLUrAnjiHbDSi1OCoeZJ4pF jyFQ== Received: by 10.180.104.197 with SMTP id gg5mr17117790wib.9.1342812762519; Fri, 20 Jul 2012 12:32:42 -0700 (PDT) Received: from Laure.box.in.irqsave.net (paradis.irqsave.net. [109.190.18.76]) by mx.google.com with ESMTPS id o2sm17624838wiz.11.2012.07.20.12.32.41 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 20 Jul 2012 12:32:41 -0700 (PDT) From: benoit.canet@gmail.com To: qemu-devel@nongnu.org Date: Fri, 20 Jul 2012 21:32:35 +0200 Message-Id: <1342812757-2651-2-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1342812757-2651-1-git-send-email-benoit@irqsave.net> References: <1342812757-2651-1-git-send-email-benoit@irqsave.net> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.125.82.173 X-Mailman-Approved-At: Fri, 20 Jul 2012 17:04:37 -0400 Cc: stefanha@gmail.com, stefanha@linux.vnet.ibm.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= Subject: [Qemu-devel] [PATCH 1/3] block: Add bdrv_have_block_jobs() so migration code abort if needed. 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 From: Benoît Canet qmp_migrate() will be able to check if some block jobs are running using bdrv_have_block_jobs() and abort safely if needed. Signed-off-by: Benoit Canet --- block.c | 14 ++++++++++++++ block.h | 2 ++ 2 files changed, 16 insertions(+) diff --git a/block.c b/block.c index ce7eb8f..2b7b999 100644 --- a/block.c +++ b/block.c @@ -4027,6 +4027,20 @@ out: return ret; } +bool bdrv_have_block_jobs(void) +{ + BlockDriverState *bs; + + QTAILQ_FOREACH(bs, &bdrv_states, list) { + if (bs->job || bdrv_in_use(bs)) { + return true; + } + bdrv_close(bs); + } + + return false; +} + void *block_job_create(const BlockJobType *job_type, BlockDriverState *bs, int64_t speed, BlockDriverCompletionFunc *cb, void *opaque, Error **errp) diff --git a/block.h b/block.h index c89590d..1335a2b 100644 --- a/block.h +++ b/block.h @@ -337,6 +337,8 @@ void bdrv_disable_copy_on_read(BlockDriverState *bs); void bdrv_set_in_use(BlockDriverState *bs, int in_use); int bdrv_in_use(BlockDriverState *bs); +bool bdrv_have_block_jobs(void); + enum BlockAcctType { BDRV_ACCT_READ, BDRV_ACCT_WRITE,