From patchwork Wed Jul 27 18:12:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frediano Ziglio X-Patchwork-Id: 107135 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8542FB6F6B for ; Thu, 28 Jul 2011 04:12:31 +1000 (EST) Received: from localhost ([::1]:59527 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qm8an-0007D0-RG for incoming@patchwork.ozlabs.org; Wed, 27 Jul 2011 14:12:25 -0400 Received: from eggs.gnu.org ([140.186.70.92]:33503) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qm8ad-0006yl-Mx for qemu-devel@nongnu.org; Wed, 27 Jul 2011 14:12:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qm8ac-0002OH-BF for qemu-devel@nongnu.org; Wed, 27 Jul 2011 14:12:15 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:40569) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qm8aZ-0002Mq-E9; Wed, 27 Jul 2011 14:12:11 -0400 Received: by mail-wy0-f173.google.com with SMTP id 28so1344394wyf.4 for ; Wed, 27 Jul 2011 11:12:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=24xrfOD3B/snXPHgWUAlAVlJXW9qdomddKRpj42zUQ4=; b=KmlMDTp2tfRduoTIlV2R7Q/d+emtB78O8BJWW5sk9aRDGZsD21z0SMXTKw6h19dH49 NUduOmjvXQ/AATm7Nkm8AXpbiusJnWm8QQH0c/TdR/R4+DyjBTb+2CD8+RuTU9eSMP7z X7iZsIkgDC1WyNj93njlLc4mSrCdnegAT6MkQ= Received: by 10.227.174.201 with SMTP id u9mr96845wbz.53.1311790330861; Wed, 27 Jul 2011 11:12:10 -0700 (PDT) Received: from obol602.localdomain (net-2-37-106-50.cust.dsl.vodafone.it [2.37.106.50]) by mx.google.com with ESMTPS id fn12sm108836wbb.38.2011.07.27.11.12.07 (version=SSLv3 cipher=OTHER); Wed, 27 Jul 2011 11:12:09 -0700 (PDT) From: Frediano Ziglio To: Stefan Hajnoczi Date: Wed, 27 Jul 2011 20:12:02 +0200 Message-Id: <1311790322-10889-4-git-send-email-freddy77@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1311790322-10889-1-git-send-email-freddy77@gmail.com> References: <1311790322-10889-1-git-send-email-freddy77@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.173 Cc: qemu-trivial@nongnu.org, qemu-devel@nongnu.org, Frediano Ziglio Subject: [Qemu-devel] [PATCH 3/3] aio: always check paio_init result 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 Signed-off-by: Frediano Ziglio --- block/raw-posix.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/block/raw-posix.c b/block/raw-posix.c index 275b41e..3c6bd4b 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -230,13 +230,15 @@ static int raw_open_common(BlockDriverState *bs, const char *filename, } } + /* We're falling back to POSIX AIO in some cases so init always */ + if (paio_init() < 0) { + goto out_free_buf; + } + #ifdef CONFIG_LINUX_AIO if ((bdrv_flags & (BDRV_O_NOCACHE|BDRV_O_NATIVE_AIO)) == (BDRV_O_NOCACHE|BDRV_O_NATIVE_AIO)) { - /* We're falling back to POSIX AIO in some cases */ - paio_init(); - s->aio_ctx = laio_init(); if (!s->aio_ctx) { goto out_free_buf; @@ -245,9 +247,6 @@ static int raw_open_common(BlockDriverState *bs, const char *filename, } else #endif { - if (paio_init() < 0) { - goto out_free_buf; - } #ifdef CONFIG_LINUX_AIO s->use_aio = 0; #endif