[Xen-changelog] [xen-unstable] xl: remove unimplemented -l stub for cpupool-list

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Andre Przywara <andre.przywara@xxxxxxx>
# Date 1296236630 0
# Node ID aab67c1c6b879b9a5312bcf2fc78b112f3847040
# Parent  b58c9dd4ba907eb5fb3d0053aac6301306568619
xl: remove unimplemented -l stub for cpupool-list

Although advertised via the usage output, xl cpupool-list -l just
returns ERROR_NI, which does not show up on the console. Instead the
output is empty, which is not exactly what --long hints to.  To avoid
confusion remove the line from the help output and just ignore the -l
option properly until it gets finally implemented.

Signed-off-by: Andre Przywara <andre.przywara@xxxxxxx>
Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 tools/libxl/xl_cmdimpl.c  |   15 +++++----------
 tools/libxl/xl_cmdtable.c |    3 +--
 2 files changed, 6 insertions(+), 12 deletions(-)

diff -r b58c9dd4ba90 -r aab67c1c6b87 tools/libxl/xl_cmdimpl.c
--- a/tools/libxl/xl_cmdimpl.c  Fri Jan 28 17:41:15 2011 +0000
+++ b/tools/libxl/xl_cmdimpl.c  Fri Jan 28 17:43:50 2011 +0000
@@ -5439,13 +5439,11 @@ int main_cpupoollist(int argc, char **ar
         return -ERROR_NOMEM;
     }
 
-    if (!opt_long) {
-        printf("%-19s", "Name");
-        if (opt_cpus)
-            printf("CPU list\n");
-        else
-            printf("CPUs   Sched     Active   Domain count\n");
-    }
+    printf("%-19s", "Name");
+    if (opt_cpus)
+        printf("CPU list\n");
+    else
+        printf("CPUs   Sched     Active   Domain count\n");
 
     for (p = 0; p < n_pools; p++) {
         if (!ret && (!pool || (poolinfo[p].poolid != poolid))) {
@@ -5453,9 +5451,6 @@ int main_cpupoollist(int argc, char **ar
             if (!name) {
                 fprintf(stderr, "error getting cpupool info\n");
                 ret = -ERROR_NOMEM;
-            }
-            else if (opt_long) {
-                ret = -ERROR_NI;
             } else {
                 printf("%-19s", name);
                 free(name);
diff -r b58c9dd4ba90 -r aab67c1c6b87 tools/libxl/xl_cmdtable.c
--- a/tools/libxl/xl_cmdtable.c Fri Jan 28 17:41:15 2011 +0000
+++ b/tools/libxl/xl_cmdtable.c Fri Jan 28 17:43:50 2011 +0000
@@ -349,8 +349,7 @@ struct cmd_spec cmd_table[] = {
     { "cpupool-list",
       &main_cpupoollist,
       "List CPU pools on host",
-      "[-l|--long] [-c|--cpus] [<CPU Pool>]",
-      "-l, --long                     Output all CPU pool details.\n"
+      "[-c|--cpus] [<CPU Pool>]",
       "-c, --cpus                     Output list of CPUs used by a pool"
     },
     { "cpupool-destroy",

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog