From patchwork Fri Jun 10 09:54:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cao jin X-Patchwork-Id: 9169179 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CA982607DA for ; Fri, 10 Jun 2016 09:50:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BE75F26B4A for ; Fri, 10 Jun 2016 09:50:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B33242835E; Fri, 10 Jun 2016 09:50:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 698D128359 for ; Fri, 10 Jun 2016 09:50:02 +0000 (UTC) Received: from localhost ([::1]:39365 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bBJ4j-0000nc-NO for patchwork-qemu-devel@patchwork.kernel.org; Fri, 10 Jun 2016 05:50:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35509) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bBJ48-0000mh-KF for qemu-devel@nongnu.org; Fri, 10 Jun 2016 05:49:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bBJ43-00053i-2K for qemu-devel@nongnu.org; Fri, 10 Jun 2016 05:49:23 -0400 Received: from [59.151.112.132] (port=9718 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bBJ42-0004yV-Du for qemu-devel@nongnu.org; Fri, 10 Jun 2016 05:49:18 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="7554258" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 10 Jun 2016 17:49:16 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85]) by cn.fujitsu.com (Postfix) with ESMTP id 2090541C0B9D; Fri, 10 Jun 2016 17:49:11 +0800 (CST) Received: from G08FNSTD140223.g08.fujitsu.local (10.167.226.69) by G08CNEXCHPEKD03.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.279.2; Fri, 10 Jun 2016 17:49:10 +0800 From: Cao jin To: Date: Fri, 10 Jun 2016 17:54:25 +0800 Message-ID: <1465552478-5540-5-git-send-email-caoj.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1465552478-5540-1-git-send-email-caoj.fnst@cn.fujitsu.com> References: <1465552478-5540-1-git-send-email-caoj.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.69] X-yoursite-MailScanner-ID: 2090541C0B9D.A7F5C X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: caoj.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH v8 04/17] megasas: Fix check for msi_init() failure X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marcel Apfelbaum , Paolo Bonzini , Markus Armbruster Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP msi_init returns non-zero value on both failure and success. cc: Paolo Bonzini cc: Marcel Apfelbaum cc: Markus Armbruster Reviewed-by: Markus Armbruster Reviewed-by: Marcel Apfelbaum Signed-off-by: Cao jin --- hw/scsi/megasas.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index a9ffc32..561e372 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -2351,7 +2351,7 @@ static void megasas_scsi_realize(PCIDevice *dev, Error **errp) "megasas-queue", 0x40000); if (megasas_use_msi(s) && - msi_init(dev, 0x50, 1, true, false)) { + msi_init(dev, 0x50, 1, true, false) < 0) { s->flags &= ~MEGASAS_MASK_USE_MSI; } if (megasas_use_msix(s) &&