diff -r 6a2089f00dc7 tools/tests/xen-access/xen-access.c
--- a/tools/tests/xen-access/xen-access.c	Fri Mar 25 10:22:10 2011 +0000
+++ b/tools/tests/xen-access/xen-access.c	Thu May 05 12:35:38 2011 -0700
@@ -482,9 +482,6 @@
 
     if ( argc == 3 && argv[0][0] == '-' )
     {
-        argv++;
-        argc--;
-
         if ( !strcmp(argv[0], "-m") )
             required = 1;
         else
@@ -492,6 +489,8 @@
             usage(progname);
             return -1;
         }
+        argv++;
+        argc--;
     }
 
     if ( argc != 2 )
@@ -651,8 +650,6 @@
     if ( rc == 0 )
         rc = rc1;
 
-    xc_interface_close(xch);
-
     DPRINTF("xenaccess exit code %d\n", rc);
     return rc;
 }