From patchwork Fri Jan 29 17:37:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 8165631 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 739779FBF9 for ; Fri, 29 Jan 2016 17:52:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E6A2020390 for ; Fri, 29 Jan 2016 17:52:06 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3F95020389 for ; Fri, 29 Jan 2016 17:52:06 +0000 (UTC) Received: from localhost ([::1]:35783 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPDDJ-0006aC-K3 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 29 Jan 2016 12:52:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48450) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPD0P-00063r-2i for qemu-devel@nongnu.org; Fri, 29 Jan 2016 12:38:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aPD0M-0006w4-9o for qemu-devel@nongnu.org; Fri, 29 Jan 2016 12:38:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60265) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPD0K-0006va-FZ; Fri, 29 Jan 2016 12:38:40 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 209B4A37C3; Fri, 29 Jan 2016 17:38:40 +0000 (UTC) Received: from noname.redhat.com (ovpn-116-58.ams2.redhat.com [10.36.116.58]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0THbumf012731; Fri, 29 Jan 2016 12:38:39 -0500 From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 29 Jan 2016 18:37:38 +0100 Message-Id: <1454089074-4819-33-git-send-email-kwolf@redhat.com> In-Reply-To: <1454089074-4819-1-git-send-email-kwolf@redhat.com> References: <1454089074-4819-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 32/48] block: acquire in bdrv_query_image_info 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Paolo Bonzini NFS calls aio_poll inside bdrv_get_allocated_size. This requires acquiring the AioContext. Signed-off-by: Paolo Bonzini Message-id: 1450867706-19860-1-git-send-email-pbonzini@redhat.com Reviewed-by: Fam Zheng Signed-off-by: Max Reitz --- block/qapi.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/block/qapi.c b/block/qapi.c index bbe0c9d..2e83105 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -211,11 +211,13 @@ void bdrv_query_image_info(BlockDriverState *bs, Error *err = NULL; ImageInfo *info; + aio_context_acquire(bdrv_get_aio_context(bs)); + size = bdrv_getlength(bs); if (size < 0) { error_setg_errno(errp, -size, "Can't get size of device '%s'", bdrv_get_device_name(bs)); - return; + goto out; } info = g_new0(ImageInfo, 1); @@ -283,10 +285,13 @@ void bdrv_query_image_info(BlockDriverState *bs, default: error_propagate(errp, err); qapi_free_ImageInfo(info); - return; + goto out; } *p_info = info; + +out: + aio_context_release(bdrv_get_aio_context(bs)); } /* @p_info will be set only on success. */