From patchwork Thu Mar 21 06:48:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Kardashevskiy X-Patchwork-Id: 1059833 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ozlabs.ru Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44PyMN6Cljz9sRW for ; Thu, 21 Mar 2019 17:59:28 +1100 (AEDT) Received: from localhost ([127.0.0.1]:60547 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6rfh-0005HV-Su for incoming@patchwork.ozlabs.org; Thu, 21 Mar 2019 02:59:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57768) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6ret-00051B-2C for qemu-devel@nongnu.org; Thu, 21 Mar 2019 02:58:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6rVl-00045o-8S for qemu-devel@nongnu.org; Thu, 21 Mar 2019 02:49:11 -0400 Received: from ozlabs.ru ([107.173.13.209]:46281) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6rVk-0003jq-W2; Thu, 21 Mar 2019 02:49:09 -0400 Received: from fstn1-p1.ozlabs.ibm.com (localhost [IPv6:::1]) by ozlabs.ru (Postfix) with ESMTP id 3186EAE8000A; Thu, 21 Mar 2019 02:48:32 -0400 (EDT) From: Alexey Kardashevskiy To: qemu-devel@nongnu.org Date: Thu, 21 Mar 2019 17:48:27 +1100 Message-Id: <20190321064827.109210-1-aik@ozlabs.ru> X-Mailer: git-send-email 2.17.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 107.173.13.209 Subject: [Qemu-devel] [PATCH qemu] spapr/nvlink2: Correct error messages 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: Alexey Kardashevskiy , qemu-ppc@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This corrects rather confusing error messages; can be squashed. Fixes: 0afa2635ef75 ("spapr: Support NVIDIA V100 GPU with NVLink2", 2019-03-12) Signed-off-by: Alexey Kardashevskiy --- hw/ppc/spapr_pci_nvlink2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/ppc/spapr_pci_nvlink2.c b/hw/ppc/spapr_pci_nvlink2.c index 3aa66aff6dbd..eda8c752aa22 100644 --- a/hw/ppc/spapr_pci_nvlink2.c +++ b/hw/ppc/spapr_pci_nvlink2.c @@ -90,7 +90,7 @@ static void spapr_pci_collect_nvgpu(struct spapr_phb_pci_nvgpu_config *nvgpus, struct spapr_phb_pci_nvgpu_slot *nvslot = spapr_nvgpu_get_slot(nvgpus, tgt); if (!nvslot) { - error_setg(errp, "Found too many NVLink bridges per GPU"); + error_setg(errp, "Found too many GPUs per vPHB"); return; } g_assert(!nvslot->gpdev); @@ -110,13 +110,13 @@ static void spapr_pci_collect_nvnpu(struct spapr_phb_pci_nvgpu_config *nvgpus, int j; if (!nvslot) { - error_setg(errp, "Found too many NVLink bridges per GPU"); + error_setg(errp, "Found too many NVLink bridges per vPHB"); return; } j = nvslot->linknum; if (j == ARRAY_SIZE(nvslot->links)) { - error_setg(errp, "Found too many NVLink2 bridges"); + error_setg(errp, "Found too many NVLink bridges per GPU"); return; } ++nvslot->linknum;