[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH 1/2] tools/xl: Sort create command options
Hopefully simplify future changes by sorting options lists for `xl create`. Signed-off-by: Elliott Mitchell <ehem+xen@xxxxxxx> --- tools/xl/xl_cmdtable.c | 10 +++++----- tools/xl/xl_vmcontrol.c | 40 ++++++++++++++++++++-------------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/tools/xl/xl_cmdtable.c b/tools/xl/xl_cmdtable.c index 661323d488..f546beaceb 100644 --- a/tools/xl/xl_cmdtable.c +++ b/tools/xl/xl_cmdtable.c @@ -24,16 +24,16 @@ const struct cmd_spec cmd_table[] = { &main_create, 1, 1, "Create a domain from config file <filename>", "<ConfigFile> [options] [vars]", + "-c Connect to the console after the domain is created.\n" + "-d Enable debug messages.\n" + "-e Do not wait in the background for the death of the domain.\n" + "-F Run in foreground until death of the domain.\n" "-h Print this help.\n" "-p Leave the domain paused after it is created.\n" - "-c Connect to the console after the domain is created.\n" "-f FILE, --defconfig=FILE\n Use the given configuration file.\n" - "-q, --quiet Quiet.\n" "-n, --dryrun Dry run - prints the resulting configuration\n" " (deprecated in favour of global -N option).\n" - "-d Enable debug messages.\n" - "-F Run in foreground until death of the domain.\n" - "-e Do not wait in the background for the death of the domain.\n" + "-q, --quiet Quiet.\n" "-V, --vncviewer Connect to the VNC display after the domain is created.\n" "-A, --vncviewer-autopass\n" " Pass VNC password to viewer via stdin.\n" diff --git a/tools/xl/xl_vmcontrol.c b/tools/xl/xl_vmcontrol.c index 435155a033..2ec4140258 100644 --- a/tools/xl/xl_vmcontrol.c +++ b/tools/xl/xl_vmcontrol.c @@ -1169,13 +1169,13 @@ int main_create(int argc, char **argv) int paused = 0, debug = 0, daemonize = 1, console_autoconnect = 0, quiet = 0, monitor = 1, vnc = 0, vncautopass = 0, ignore_masks = 0; int opt, rc; - static struct option opts[] = { + static const struct option opts[] = { + {"defconfig", 1, 0, 'f'}, {"dryrun", 0, 0, 'n'}, + {"ignore-global-affinity-masks", 0, 0, 'i'}, {"quiet", 0, 0, 'q'}, - {"defconfig", 1, 0, 'f'}, {"vncviewer", 0, 0, 'V'}, {"vncviewer-autopass", 0, 0, 'A'}, - {"ignore-global-affinity-masks", 0, 0, 'i'}, COMMON_LONG_OPTS }; @@ -1186,12 +1186,15 @@ int main_create(int argc, char **argv) argc--; argv++; } - SWITCH_FOREACH_OPT(opt, "Fnqf:pcdeVAi", opts, "create", 0) { - case 'f': - filename = optarg; + SWITCH_FOREACH_OPT(opt, "Ffnq:AVcdeip", opts, "create", 0) { + case 'A': + vnc = vncautopass = 1; break; - case 'p': - paused = 1; + case 'F': + daemonize = 0; + break; + case 'V': + vnc = 1; break; case 'c': console_autoconnect = 1; @@ -1199,28 +1202,25 @@ int main_create(int argc, char **argv) case 'd': debug = 1; break; - case 'F': - daemonize = 0; - break; case 'e': daemonize = 0; monitor = 0; break; + case 'f': + filename = optarg; + break; + case 'i': + ignore_masks = 1; + break; case 'n': dryrun_only = 1; break; + case 'p': + paused = 1; + break; case 'q': quiet = 1; break; - case 'V': - vnc = 1; - break; - case 'A': - vnc = vncautopass = 1; - break; - case 'i': - ignore_masks = 1; - break; } memset(&dom_info, 0, sizeof(dom_info)); -- 2.30.2
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |