david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move out option lookup into a separate function

Browse Source 
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Anthony Liguori 2010-01-22 09:18:06 -06:00
parent 07381cc1b4
commit 6530a97bdd
1 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
vl.c
View File

@ -4658,6 +4658,46 @@ static int debugcon_parse(const char *devname)
return 0; return 0;
} }
static const QEMUOption *lookup_opt(int argc, char **argv,
const char **poptarg, int *poptind)
{
const QEMUOption *popt;
int optind = *poptind;
char *r = argv[optind];
const char *optarg;
optind++;
/* Treat --foo the same as -foo. */
if (r[1] == '-')
r++;
popt = qemu_options;
for(;;) {
if (!popt->name) {
fprintf(stderr, "%s: invalid option -- '%s'\n",
argv[0], r);
exit(1);
}
if (!strcmp(popt->name, r + 1))
break;
popt++;
}
if (popt->flags & HAS_ARG) {
if (optind >= argc) {
fprintf(stderr, "%s: option '%s' requires an argument\n",
argv[0], r);
exit(1);
}
optarg = argv[optind++];
} else {
optarg = NULL;
}
*poptarg = optarg;
*poptind = optind;
return popt;
}
int main(int argc, char **argv, char **envp) int main(int argc, char **argv, char **envp)
{ {
const char *gdbstub_dev = NULL; const char *gdbstub_dev = NULL;
@ -4672,7 +4712,7 @@ int main(int argc, char **argv, char **envp)
int cyls, heads, secs, translation; int cyls, heads, secs, translation;
QemuOpts *hda_opts = NULL, *opts; QemuOpts *hda_opts = NULL, *opts;
int optind; int optind;
const char *r, *optarg; const char *optarg;
const char *loadvm = NULL; const char *loadvm = NULL;
QEMUMachine *machine; QEMUMachine *machine;
const char *cpu_model; const char *cpu_model;
@ -4753,38 +4793,12 @@ int main(int argc, char **argv, char **envp)
for(;;) { for(;;) {
if (optind >= argc) if (optind >= argc)
break; break;
r = argv[optind]; if (argv[optind][0] != '-') {
if (r[0] != '-') {
hda_opts = drive_add(argv[optind++], HD_ALIAS, 0); hda_opts = drive_add(argv[optind++], HD_ALIAS, 0);
} else { } else {
const QEMUOption *popt; const QEMUOption *popt;
optind++; popt = lookup_opt(argc, argv, &optarg, &optind);
/* Treat --foo the same as -foo. */
if (r[1] == '-')
r++;
popt = qemu_options;
for(;;) {
if (!popt->name) {
fprintf(stderr, "%s: invalid option -- '%s'\n",
argv[0], r);
exit(1);
}
if (!strcmp(popt->name, r + 1))
break;
popt++;
}
if (popt->flags & HAS_ARG) {
if (optind >= argc) {
fprintf(stderr, "%s: option '%s' requires an argument\n",
argv[0], r);
exit(1);
}
optarg = argv[optind++];
} else {
optarg = NULL;
}
switch(popt->index) { switch(popt->index) {
case QEMU_OPTION_M: case QEMU_OPTION_M:
machine = find_machine(optarg); machine = find_machine(optarg);