From patchwork Mon Jun 6 08:00:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cao jin X-Patchwork-Id: 9157371 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 CBC6960467 for ; Mon, 6 Jun 2016 08:05:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BE1BF254F7 for ; Mon, 6 Jun 2016 08:05:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B1A46272AA; Mon, 6 Jun 2016 08:05:48 +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 34DFA254F7 for ; Mon, 6 Jun 2016 08:05:48 +0000 (UTC) Received: from localhost ([::1]:40547 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9pXf-0006Dy-Cb for patchwork-qemu-devel@patchwork.kernel.org; Mon, 06 Jun 2016 04:05:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44330) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9pOY-0006dn-37 for qemu-devel@nongnu.org; Mon, 06 Jun 2016 03:56:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b9pOT-0000Xa-Tm for qemu-devel@nongnu.org; Mon, 06 Jun 2016 03:56:22 -0400 Received: from [59.151.112.132] (port=51942 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9pOT-0000QT-7E for qemu-devel@nongnu.org; Mon, 06 Jun 2016 03:56:17 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="7397509" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 06 Jun 2016 15:55:51 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85]) by cn.fujitsu.com (Postfix) with ESMTP id 9CED142C7694; Mon, 6 Jun 2016 15:55:50 +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; Mon, 6 Jun 2016 15:55:50 +0800 From: Cao jin To: Date: Mon, 6 Jun 2016 16:00:58 +0800 Message-ID: <1465200062-13824-12-git-send-email-caoj.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1465200062-13824-1-git-send-email-caoj.fnst@cn.fujitsu.com> References: <1465200062-13824-1-git-send-email-caoj.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.69] X-yoursite-MailScanner-ID: 9CED142C7694.ACEB6 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 v7 11/15] msi_init: change return value to 0 on success 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 , Hannes Reinecke , Markus Armbruster , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP No caller use its return value as msi capability offset, in order to make its return behaviour consistent with msix_init(). cc: Michael S. Tsirkin cc: Paolo Bonzini cc: Hannes Reinecke cc: Markus Armbruster cc: Marcel Apfelbaum Signed-off-by: Cao jin Acked-by: Hannes Reinecke --- hw/pci/msi.c | 6 +++--- hw/scsi/megasas.c | 2 +- hw/scsi/mptsas.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/pci/msi.c b/hw/pci/msi.c index aa6cf49..70464bf 100644 --- a/hw/pci/msi.c +++ b/hw/pci/msi.c @@ -173,8 +173,7 @@ bool msi_enabled(const PCIDevice *dev) * If @msi64bit, make the device capable of sending a 64-bit message * address. * If @msi_per_vector_mask, make the device support per-vector masking. - * Return the offset of capability MSI in config space on success, - * return -errno on error. + * Return 0 on success, return -errno on error. * * -ENOTSUP means lacking msi support for a msi-capable platform. * -EINVAL means capability overlap, happens when @offset is non-zero, @@ -236,7 +235,8 @@ int msi_init(struct PCIDevice *dev, uint8_t offset, pci_set_long(dev->wmask + msi_mask_off(dev, msi64bit), 0xffffffff >> (PCI_MSI_VECTORS_MAX - nr_vectors)); } - return config_offset; + + return 0; } void msi_uninit(struct PCIDevice *dev) diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 635be13..26119bf 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -2346,7 +2346,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) < 0) { + msi_init(dev, 0x50, 1, true, false)) { s->msi = ON_OFF_AUTO_OFF; } if (megasas_use_msix(s) && diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c index 4ff4d06..d4773e2 100644 --- a/hw/scsi/mptsas.c +++ b/hw/scsi/mptsas.c @@ -1286,7 +1286,7 @@ static void mptsas_scsi_realize(PCIDevice *dev, Error **errp) "mptsas-diag", 0x10000); if (s->msi != ON_OFF_AUTO_OFF && - msi_init(dev, 0, 1, true, false) >= 0) { + msi_init(dev, 0, 1, true, false) > 0) { /* TODO check for errors */ s->msi_in_use = true; }