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

xl: block-detach 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 17b5c5ec3c..9bc243842e 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -3752,7 +3752,7 @@ int main_blockdetach(int argc, char **argv)
     int opt;
     libxl_device_disk disk;
 
-    if (argc != 3) {
+    if (argc != 4) {
         help("block-detach");
         exit(0);
     }
@@ -3767,12 +3767,12 @@ int main_blockdetach(int argc, char **argv)
         }
     }
 
-    if (domain_qualifier_to_domid(argv[1], &domid, 0) < 0) {
-        fprintf(stderr, "%s is an invalid domain identifier\n", argv[1]);
+    if (domain_qualifier_to_domid(argv[2], &domid, 0) < 0) {
+        fprintf(stderr, "%s is an invalid domain identifier\n", argv[2]);
         exit(1);
     }
-    if (libxl_devid_to_device_disk(&ctx, domid, argv[2], &disk)) {
-        fprintf(stderr, "Error: Device %s not connected.\n", argv[2]);
+    if (libxl_devid_to_device_disk(&ctx, domid, argv[3], &disk)) {
+        fprintf(stderr, "Error: Device %s not connected.\n", argv[3]);
         exit(1);
     }
     if (libxl_device_disk_del(&ctx, &disk, 1)) {