start refactoring build, completely broken atm'

run

@@ -10,30 +10,30 @@ import common
 
 defaults = {
     'cpus': 1,
-    'debug_vm': False,
     'debug_guest': False,
+    'debug_vm': False,
     'eval': None,
-    'kernel_cli_extra': None,
-    'kernel_cli_extra_after_dash_base64': None,
-    'kernel_cli_extra_after_dash': None,
-    'gem5_exe_args':'',
+    'extra_emulator_args': None,
     'gem5_biglittle': False,
+    'gem5_exe_args':'',
+    'gem5_restore_last_checkpoint': None,
+    'graphic': False,
     'initramfs': False,
     'initrd': False,
-    'kvm': False,
+    'kernel_cli_extra': None,
+    'kernel_cli_extra_after_dash': None,
+    'kernel_cli_extra_after_dash_base64': None,
     'kgdb': False,
-    'gem5_restore_last_checkpoint': None,
+    'kvm': False,
     'memory': '256M',
     'prebuilt': False,
-    'qemu_replay': False,
     'qemu_record': False,
-    'trace': None,
+    'qemu_replay': False,
     'terminal': False,
-    'tmux_args': '',
     'tmux': False,
-    'graphic': False,
+    'tmux_args': '',
+    'trace': None,
     'vnc': False,
-    'extra_emulator_args': None,
 }
 
 def main(args, extra_args=None):
@@ -285,8 +285,7 @@ def main(args, extra_args=None):
                 return 1
     return 0
 
-if __name__ == '__main__':
-    # Argparse.
+def get_argparse():
     parser = common.get_argparse(argparse_args={'description':'Run Linux on an emulator'})
     init_group = parser.add_mutually_exclusive_group()
     kvm_group = parser.add_mutually_exclusive_group()
@@ -439,5 +438,9 @@ Run QEMU with VNC instead of the default SDL. Connect to it with:
         'extra_emulator_args', nargs='*',
         help='Extra options to append at the end of the emulator command line'
     )
+    return parser
+
+if __name__ == '__main__':
+    parser = get_argparse()
     args = common.setup(parser)
     sys.exit(main(args))