# HG changeset patch
# User Juergen Gross <juergen.gross@xxxxxxxxxxxxxx>
# Date 1290673969 -3600
# Node ID 37dc5cb8c5857d7ffa3e3572d6d4090478b8cebc
# Parent  37fdfe90e0c26bfac22eff6b30b58a5365a50746
support topolgy info in xl info

Adds option -n/--numa to xl info command to print topology information.
No numa information up to now, as I've no machine which will give this info
via xm info (could be a bug in xm, however).

Signed-off-by: juergen.gross@xxxxxxxxxxxxxx

diff -r 37fdfe90e0c2 -r 37dc5cb8c585 tools/libxl/xl_cmdimpl.c
--- a/tools/libxl/xl_cmdimpl.c	Thu Nov 25 09:29:43 2010 +0100
+++ b/tools/libxl/xl_cmdimpl.c	Thu Nov 25 09:32:49 2010 +0100
@@ -3925,12 +3925,41 @@
     return;
 }
 
-static void info(void)
+static void output_topologyinfo(void)
+{
+    libxl_topologyinfo *info;
+    int i;
+
+    info = libxl_get_topologyinfo(&ctx);
+    if (info == NULL) {
+        fprintf(stderr, "libxl_get_topologyinfo failed.\n");
+        return;
+    }
+
+    printf("cpu_topology           :\n");
+    printf("cpu:    core    socket     node\n");
+
+    for (i = 0; i < info->coremap.entries; i++) {
+        if (info->coremap.array[i] != LIBXL_CPUARRAY_INVENTRY)
+            printf("%3d:    %4d     %4d     %4d\n", i, info->coremap.array[i],
+                info->socketmap.array[i], info->nodemap.array[i]);
+    }
+
+    printf("numa_info              : none\n");
+
+    libxl_topologyinfo_destroy(info);
+    return;
+}
+
+static void info(int numa)
 {
     output_nodeinfo();
 
     output_physinfo();
 
+    if (numa)
+        output_topologyinfo();
+
     output_xeninfo();
 
     printf("xend_config_format     : 4\n");
@@ -3941,19 +3970,29 @@
 int main_info(int argc, char **argv)
 {
     int opt;
-
-    while ((opt = getopt(argc, argv, "h")) != -1) {
+    int option_index = 0;
+    static struct option long_options[] = {
+        {"help", 0, 0, 'h'},
+        {"numa", 0, 0, 'n'},
+        {0, 0, 0, 0}
+    };
+    int numa = 0;
+
+    while ((opt = getopt_long(argc, argv, "hn", long_options, &option_index)) != -1) {
         switch (opt) {
         case 'h':
             help("info");
             return 0;
-        default:
-            fprintf(stderr, "option `%c' not supported.\n", opt);
-            break;
-        }
-    }
-
-    info();
+        case 'n':
+            numa = 1;
+            break;
+        default:
+            fprintf(stderr, "option `%c' not supported.\n", opt);
+            break;
+        }
+    }
+
+    info(numa);
     return 0;
 }
 
diff -r 37fdfe90e0c2 -r 37dc5cb8c585 tools/libxl/xl_cmdtable.c
--- a/tools/libxl/xl_cmdtable.c	Thu Nov 25 09:29:43 2010 +0100
+++ b/tools/libxl/xl_cmdtable.c	Thu Nov 25 09:32:49 2010 +0100
@@ -185,7 +185,7 @@
     { "info",
       &main_info,
       "Get information about Xen host",
-      "",
+      "-n, --numa         List host NUMA topology information",
     },
     { "sched-credit",
       &main_sched_credit,