[Xen-devel] [PATCH 1/3] xl: fix network-attach command line parsing

[Jeremy Fitzhardinge <jeremy@xxxxxxxx>]

Command line arguments start at argv[2].

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>

diff -r 8e9db04e9d40 tools/libxl/xl_cmdimpl.c
--- a/tools/libxl/xl_cmdimpl.c  Tue Jun 01 15:19:38 2010 -0700
+++ b/tools/libxl/xl_cmdimpl.c  Wed Jun 02 11:34:39 2010 -0700
@@ -3308,11 +3308,11 @@
     int i;
     unsigned int val;
 
-    if ((argc < 2) || (argc > 11)) {
+    if ((argc < 3) || (argc > 11)) {
         help("network-attach");
         exit(0);
     }
-    while ((opt = getopt(argc, argv, "hl")) != -1) {
+    while ((opt = getopt(argc, argv, "h")) != -1) {
         switch (opt) {
         case 'h':
             help("network-attach");
@@ -3323,12 +3323,12 @@
         }
     }
 
-    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);
     }
     init_nic_info(&nic, -1);
-    for (argv += 2, argc -= 2; argc > 0; ++argv, --argc) {
+    for (argv += 3, argc -= 3; argc > 0; ++argv, --argc) {
         if (!strncmp("type=", *argv, 5)) {
             if (!strncmp("vif", (*argv) + 5, 4)) {
                 nic.nictype = NICTYPE_VIF;



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