aboutsummaryrefslogtreecommitdiff
path: root/linux-user
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2011-07-18 11:44:09 +0100
committerAndrzej Zaborowski <andrew.zaborowski@intel.com>2011-07-30 07:20:18 +0200
commit4b5dfd8246321d2cdca0508f6837a681f7873f43 (patch)
tree694a9d4cd141b66856f2d15353cdf0a5532a6b89 /linux-user
parent8534b8ba337e55031592144ea524f7bcaf144113 (diff)
downloadqemu-4b5dfd8246321d2cdca0508f6837a681f7873f43.zip
qemu-4b5dfd8246321d2cdca0508f6837a681f7873f43.tar.gz
qemu-4b5dfd8246321d2cdca0508f6837a681f7873f43.tar.bz2
user: Restore debug usage message for '-d ?' in user mode emulation
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>
Diffstat (limited to 'linux-user')
-rw-r--r--linux-user/main.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/linux-user/main.c b/linux-user/main.c
index 2135b9c..6a8f4bd 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -3048,11 +3048,6 @@ int main(int argc, char **argv, char **envp)
usage();
}
}
- if (optind >= argc)
- usage();
- filename = argv[optind];
- exec_path = argv[optind];
-
/* init debug */
cpu_set_log_filename(log_file);
if (log_mask) {
@@ -3070,6 +3065,12 @@ int main(int argc, char **argv, char **envp)
cpu_set_log(mask);
}
+ if (optind >= argc) {
+ usage();
+ }
+ filename = argv[optind];
+ exec_path = argv[optind];
+
/* Zero out regs */
memset(regs, 0, sizeof(struct target_pt_regs));