From patchwork Tue Jan 17 06:18:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cao jin X-Patchwork-Id: 9520017 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 BADEB60447 for ; Tue, 17 Jan 2017 06:14:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AB8AA284DA for ; Tue, 17 Jan 2017 06:14:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A0716284DD; Tue, 17 Jan 2017 06:14:17 +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 470D8284E7 for ; Tue, 17 Jan 2017 06:14:17 +0000 (UTC) Received: from localhost ([::1]:33095 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTN28-0007A7-4N for patchwork-qemu-devel@patchwork.kernel.org; Tue, 17 Jan 2017 01:14:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50283) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTN1U-00079P-WF for qemu-devel@nongnu.org; Tue, 17 Jan 2017 01:13:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cTN1U-0007bQ-0B for qemu-devel@nongnu.org; Tue, 17 Jan 2017 01:13:36 -0500 Received: from [59.151.112.132] (port=27872 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTN1T-0007aA-AJ for qemu-devel@nongnu.org; Tue, 17 Jan 2017 01:13:35 -0500 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="14829784" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 17 Jan 2017 14:13:18 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85]) by cn.fujitsu.com (Postfix) with ESMTP id A777047AD1D4 for ; Tue, 17 Jan 2017 14:13:18 +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.319.2; Tue, 17 Jan 2017 14:13:18 +0800 From: Cao jin To: Date: Tue, 17 Jan 2017 14:18:49 +0800 Message-ID: <1484633936-25344-5-git-send-email-caoj.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1484633936-25344-1-git-send-email-caoj.fnst@cn.fujitsu.com> References: <1484633936-25344-1-git-send-email-caoj.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.69] X-yoursite-MailScanner-ID: A777047AD1D4.AB9DF 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 v9 04/11] msix: check msix_init's return value 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: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Doesn't do it for megasas & hcd-xhci, later patches will fix them. Signed-off-by: Cao jin --- hw/net/e1000e.c | 4 ++++ hw/net/rocker/rocker.c | 5 +++++ hw/net/vmxnet3.c | 6 +++++- hw/virtio/virtio-pci.c | 13 +++++++------ 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c index ed04adce061c..74cbbef30366 100644 --- a/hw/net/e1000e.c +++ b/hw/net/e1000e.c @@ -294,6 +294,10 @@ e1000e_init_msix(E1000EState *s) E1000E_MSIX_IDX, E1000E_MSIX_PBA, 0xA0, NULL); + /* Any error other than -ENOTSUP(board's MSI support is broken) + * is a programming error. Fall back to INTx silently on -ENOTSUP */ + assert(!res || res == -ENOTSUP); + if (res < 0) { trace_e1000e_msix_init_fail(res); } else { diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c index 6e70fddee36b..e394fd61fe64 100644 --- a/hw/net/rocker/rocker.c +++ b/hw/net/rocker/rocker.c @@ -1264,6 +1264,11 @@ static int rocker_msix_init(Rocker *r) &r->msix_bar, ROCKER_PCI_MSIX_BAR_IDX, ROCKER_PCI_MSIX_PBA_OFFSET, 0, &local_err); + + /* Any error other than -ENOTSUP(board's MSI support is broken) + * is a programming error. */ + assert(!err || err == -ENOTSUP); + if (err) { error_report_err(local_err); return err; diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index 7b2971fe5902..a433cc017cb1 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -2193,8 +2193,12 @@ vmxnet3_init_msix(VMXNET3State *s) VMXNET3_MSIX_BAR_IDX, VMXNET3_OFF_MSIX_PBA(s), VMXNET3_MSIX_OFFSET(s), NULL); + /* Any error other than -ENOTSUP(board's MSI support is broken) + * is a programming error. Fall back to INTx on -ENOTSUP */ + assert(!res || res == -ENOTSUP); + if (0 > res) { - VMW_WRPRN("Failed to initialize MSI-X, error %d", res); + VMW_WRPRN("Failed to initialize MSI-X, board's MSI support is broken"); s->msix_used = false; } else { if (!vmxnet3_use_msix_vectors(s, VMXNET3_MAX_INTRS)) { diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 4c2c4941d245..2417c78c477e 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1670,13 +1670,14 @@ static void virtio_pci_device_plugged(DeviceState *d, Error **errp) if (proxy->nvectors) { int err = msix_init_exclusive_bar(&proxy->pci_dev, proxy->nvectors, - proxy->msix_bar_idx, NULL); + proxy->msix_bar_idx, errp); + + /* Any error other than -ENOTSUP(board's MSI support is broken) + * is a programming error. */ + assert(!err || err == -ENOTSUP); + if (err) { - /* Notice when a system that supports MSIx can't initialize it */ - if (err != -ENOTSUP) { - error_report("unable to init msix vectors to %" PRIu32, - proxy->nvectors); - } + error_report_err(*errp); proxy->nvectors = 0; } }