Make the image.xml an argument, not a mandatory option

Author: David Lutterkort

virt-image

@@ -69,9 +69,7 @@ def get_graphics(domain, vnc, vncport, nographics, sdl, keymap, guest):
 ### Option parsing
 def parse_args():
     parser = OptionParser()
-    parser.add_option("-i", "--image", type="string", dest="image",
-                      action="callback", callback=cli.check_before_store,
-                      help=_("The XML description of the virtual image"))
+    parser.set_usage("%prog [options] image.xml")
     parser.add_option("-n", "--name", type="string", dest="name",
                       action="callback", callback=cli.check_before_store,
                       help=_("Name of the guest instance"))
@@ -128,6 +126,10 @@ def parse_args():
                       help=_("The zero-based index of the boot record to use"))
 
     (options,args) = parser.parse_args()
+    if len(args) < 1:
+        parser.error(_("You need to provide an image XML descriptor"))
+    options.image = args[0]
+    
     return options
 
 def parse_image_xml(fname):