Add device minor to the CLI info command

NVIDIA · Mar 5, 2018 · e48a0d4 · e48a0d4
1 parent 019fdc1
commit e48a0d4
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/cli/info.c b/src/cli/info.c
@@ -2,6 +2,8 @@
  * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved.
  */
 
+#include <sys/sysmacros.h>
+
 #include <alloca.h>
 #include <err.h>
 #include <stdio.h>
@@ -102,15 +104,15 @@ info_command(const struct context *ctx)
 
         if (ctx->csv_output) {
                 printf("NVRM version,CUDA version\n%s,%s\n", drv->nvrm_version, drv->cuda_version);
-                printf("\nDevice Index,Model,GPU UUID,Bus Location,Architecture\n");
+                printf("\nDevice Index,Device Minor,Model,GPU UUID,Bus Location,Architecture\n");
                 for (size_t i = 0; i < dev->ngpus; ++i)
-                        printf("%zu,%s,%s,%s,%s\n", i, dev->gpus[i].model, dev->gpus[i].uuid, dev->gpus[i].busid, dev->gpus[i].arch);
+                        printf("%zu,%u,%s,%s,%s,%s\n", i, minor(dev->gpus[i].node.id), dev->gpus[i].model, dev->gpus[i].uuid, dev->gpus[i].busid, dev->gpus[i].arch);
 
         } else {
                 printf("%-15s %s\n%-15s %s\n", "NVRM version:", drv->nvrm_version, "CUDA version:", drv->cuda_version);
                 for (size_t i = 0; i < dev->ngpus; ++i)
-                        printf("\n%-15s %zu\n%-15s %s\n%-15s %s\n%-15s %s\n%-15s %s\n",
-                            "Device Index:", i, "Model:", dev->gpus[i].model, "GPU UUID:", dev->gpus[i].uuid,
+                        printf("\n%-15s %zu\n%-15s %u\n%-15s %s\n%-15s %s\n%-15s %s\n%-15s %s\n",
+                            "Device Index:", i, "Device Minor:", minor(dev->gpus[i].node.id), "Model:", dev->gpus[i].model, "GPU UUID:", dev->gpus[i].uuid,
                             "Bus Location:", dev->gpus[i].busid, "Architecture:", dev->gpus[i].arch);
         }