mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

user: Restore debug usage message for '-d ?' in user mode emulation

Browse Source 
The code which prints the debug usage message on '-d ?' for *-user
has to come before the check for "not enough arguments", so that
"qemu-foo -d ?" prints the list of possible debug log items rather than
the generic usage message. (This was inadvertently broken in commit
c235d73.)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andrzej Zaborowski <andrew.zaborowski@intel.com>
This commit is contained in:
Peter Maydell 2011-07-18 11:44:09 +01:00 committed by Andrzej Zaborowski
parent 8534b8ba33
commit 4b5dfd8246
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bsd-user/main.c
View File

@ -856,9 +856,6 @@ int main(int argc, char **argv)
usage(); usage();
} }
} }
if (optind >= argc)
usage();
filename = argv[optind];
/* init debug */ /* init debug */
cpu_set_log_filename(log_file); cpu_set_log_filename(log_file);
@ -877,6 +874,11 @@ int main(int argc, char **argv)
cpu_set_log(mask); cpu_set_log(mask);
} }
if (optind >= argc) {
usage();
}
filename = argv[optind];
/* Zero out regs */ /* Zero out regs */
memset(regs, 0, sizeof(struct target_pt_regs)); memset(regs, 0, sizeof(struct target_pt_regs));

8
darwin-user/main.c
View File

@ -809,9 +809,6 @@ int main(int argc, char **argv)
usage(); usage();
} }
} }
if (optind >= argc)
usage();
filename = argv[optind];
/* init debug */ /* init debug */
cpu_set_log_filename(log_file); cpu_set_log_filename(log_file);
@ -830,6 +827,11 @@ int main(int argc, char **argv)
cpu_set_log(mask); cpu_set_log(mask);
} }
if (optind >= argc) {
usage();
}
filename = argv[optind];
/* Zero out regs */ /* Zero out regs */
memset(regs, 0, sizeof(struct target_pt_regs)); memset(regs, 0, sizeof(struct target_pt_regs));

11
linux-user/main.c
View File

@ -3048,11 +3048,6 @@ int main(int argc, char **argv, char **envp)
usage(); usage();
} }
} }
if (optind >= argc)
usage();
filename = argv[optind];
exec_path = argv[optind];
/* init debug */ /* init debug */
cpu_set_log_filename(log_file); cpu_set_log_filename(log_file);
if (log_mask) { if (log_mask) {
@ -3070,6 +3065,12 @@ int main(int argc, char **argv, char **envp)
cpu_set_log(mask); cpu_set_log(mask);
} }
if (optind >= argc) {
usage();
}
filename = argv[optind];
exec_path = argv[optind];
/* Zero out regs */ /* Zero out regs */
memset(regs, 0, sizeof(struct target_pt_regs)); memset(regs, 0, sizeof(struct target_pt_regs));