summaryrefslogtreecommitdiffstats
path: root/bsd-user/main.c
diff options
context:
space:
mode:
authormalc2011-08-05 08:07:10 +0200
committermalc2011-08-05 08:07:10 +0200
commita67a47d2b559a7733c3f89aeb2d81b19d2c027e4 (patch)
tree146a7b6eebbee1367453fde501d4462ac6d9f8b4 /bsd-user/main.c
parentMerge branch 'master' of git://git.qemu.org/qemu (diff)
parentMerge remote-tracking branch 'mst/for_anthony' into staging (diff)
downloadqemu-a67a47d2b559a7733c3f89aeb2d81b19d2c027e4.tar.gz
qemu-a67a47d2b559a7733c3f89aeb2d81b19d2c027e4.tar.xz
qemu-a67a47d2b559a7733c3f89aeb2d81b19d2c027e4.zip
Merge branch 'master' of git://git.qemu.org/qemu
Diffstat (limited to 'bsd-user/main.c')
-rw-r--r--bsd-user/main.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/bsd-user/main.c b/bsd-user/main.c
index 6018a419ed..a63b8777fc 100644
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -856,9 +856,6 @@ int main(int argc, char **argv)
usage();
}
}
- if (optind >= argc)
- usage();
- filename = argv[optind];
/* init debug */
cpu_set_log_filename(log_file);
@@ -877,6 +874,11 @@ int main(int argc, char **argv)
cpu_set_log(mask);
}
+ if (optind >= argc) {
+ usage();
+ }
+ filename = argv[optind];
+
/* Zero out regs */
memset(regs, 0, sizeof(struct target_pt_regs));