tools/tests/xen-access: minor bug fixes

Fix a couple of minor bugs in xen-access test program:
 * Fix -m option handling.
 * Fix a segfault that was occurring during program exit.

Signed-off-by: Aravindh Puthiyaparambil <aravindh@virtuata.com>
xen-unstable changeset:   23307:1649275965f0
xen-unstable date:        Mon May 09 09:56:39 2011 +0100

tools/tests/xen-access/xen-access.c

@@ -482,9 +482,6 @@ int main(int argc, char *argv[])
 
     if ( argc == 3 && argv[0][0] == '-' )
     {
-        argv++;
-        argc--;
-
         if ( !strcmp(argv[0], "-m") )
             required = 1;
         else
@@ -492,6 +489,8 @@ int main(int argc, char *argv[])
             usage(progname);
             return -1;
         }
+        argv++;
+        argc--;
     }
 
     if ( argc != 2 )
@@ -651,8 +650,6 @@ int main(int argc, char *argv[])
     if ( rc == 0 )
         rc = rc1;
 
-    xc_interface_close(xch);
-
     DPRINTF("xenaccess exit code %d\n", rc);
     return rc;
 }