From: Keir Fraser <keir.fraser@citrix.com>
Date: Mon, 7 Jun 2010 06:13:41 +0000 (+0100)
Subject: xl: block-list command line parsing
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~12005
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d15309d79c1df0ec8dff819511cd72cc67a34be4;p=xen.git

xl: block-list command line parsing

Command line arguments start at argv[2].

Signed-off-by: Eric Chanudet <eric.chanudet@citrix.com>
---

diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 2fe89f3bfe..17b5c5ec3c 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -3709,7 +3709,7 @@ int main_blocklist(int argc, char **argv)
     libxl_device_disk *disks;
     libxl_diskinfo diskinfo;
 
-    if (argc < 2) {
+    if (argc < 3) {
         help("block-list");
         exit(0);
     }
@@ -3726,7 +3726,7 @@ int main_blocklist(int argc, char **argv)
 
     printf("%-5s %-3s %-6s %-5s %-6s %-8s %-30s\n",
            "Vdev", "BE", "handle", "state", "evt-ch", "ring-ref", "BE-path");
-    for (++argv, --argc; argc > 0; --argc, ++argv) {
+    for (argv += 2, argc -= 2; argc > 0; --argc, ++argv) {
         if (domain_qualifier_to_domid(*argv, &domid, 0) < 0) {
             fprintf(stderr, "%s is an invalid domain identifier\n", *argv);
             continue;