On Thu, Mar 21, 2019 at 05:48:27PM +1100, Alexey Kardashevskiy wrote: > 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 <a...@ozlabs.ru>
Applied and squashed. > --- > 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; -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature