commit 4b5dfd8246321d2cdca0508f6837a681f7873f43
author Peter Maydell <peter.maydell@linaro.org> Mon Jul 18 11:44:09 2011 +0100
committer Andrzej Zaborowski <andrew.zaborowski@intel.com> Sat Jul 30 07:20:18 2011 +0200
tree 694a9d4cd141b66856f2d15353cdf0a5532a6b89
parent 8534b8ba337e55031592144ea524f7bcaf144113

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>

bsd-user/main.c

diff --git a/bsd-user/main.c b/bsd-user/main.c
index 6018a41..a63b877 100644
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -856,9 +856,6 @@
             usage();
         }
     }
-    if (optind >= argc)
-        usage();
-    filename = argv[optind];
 
     /* init debug */
     cpu_set_log_filename(log_file);
@@ -877,6 +874,11 @@
         cpu_set_log(mask);
     }
 
+    if (optind >= argc) {
+        usage();
+    }
+    filename = argv[optind];
+
     /* Zero out regs */
     memset(regs, 0, sizeof(struct target_pt_regs));