summaryrefslogtreecommitdiffstats
path: root/linux-user/main.c
diff options
context:
space:
mode:
authorBlue Swirl2012-02-04 13:18:36 +0100
committerBlue Swirl2012-02-04 13:18:36 +0100
commitcb437e48ab7ddd9b85843beb524904ee4b565721 (patch)
tree56b81401aaec347d689102972d028010fd35e8ba /linux-user/main.c
parentw32: Fix build with new net bridge code (diff)
parentlinux-user: Fix sa_flags byte swaps for mips (diff)
downloadqemu-cb437e48ab7ddd9b85843beb524904ee4b565721.tar.gz
qemu-cb437e48ab7ddd9b85843beb524904ee4b565721.tar.xz
qemu-cb437e48ab7ddd9b85843beb524904ee4b565721.zip
Merge branch 'linux-user-for-upstream' of git://git.linaro.org/people/rikuvoipio/qemu
* 'linux-user-for-upstream' of git://git.linaro.org/people/rikuvoipio/qemu: linux-user: Fix sa_flags byte swaps for mips linux-user: Define TARGET_QEMU_ESIGRETURN for mips64 linux-user: Define TARGET_QEMU_ESIGRETURN for mipsn32 linux-user: Add default configs for mips64[el] linux-user: Add default-configs for mipsn32[el] linux-user: Implement *listxattr syscalls linux-user/syscall.c: Implement f and l versions of set/get/removexattr linux-user: Allow NULL value pointer in setxattr and getxattr linux-user: fix wait* syscall status returns linux-user/strace.c: Correct errno printing for mmap etc linux-user: fix QEMU_STRACE=1 segfault linux-user: add SO_PEERCRED support for getsockopt linux-user/main.c: Add option to user-mode emulation so that user can specify log file name linux-user: fake /proc/self/auxv linux-user: fake /proc/self/stat linux-user: fake /proc/self/maps linux-user: add open() hijack infrastructure linux-user: save auxv length linux-user: stack_base is now mandatory on all targets
Diffstat (limited to 'linux-user/main.c')
-rw-r--r--linux-user/main.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/linux-user/main.c b/linux-user/main.c
index 64d2208a08..14bf5f0bc7 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -2945,6 +2945,11 @@ static void handle_arg_log(const char *arg)
cpu_set_log(mask);
}
+static void handle_arg_log_filename(const char *arg)
+{
+ cpu_set_log_filename(arg);
+}
+
static void handle_arg_set_env(const char *arg)
{
char *r, *p, *token;
@@ -3125,6 +3130,8 @@ struct qemu_argument arg_table[] = {
#endif
{"d", "QEMU_LOG", true, handle_arg_log,
"options", "activate log"},
+ {"D", "QEMU_LOG_FILENAME", true, handle_arg_log_filename,
+ "logfile", "override default logfile location"},
{"p", "QEMU_PAGESIZE", true, handle_arg_pagesize,
"pagesize", "set the host page size to 'pagesize'"},
{"singlestep", "QEMU_SINGLESTEP", false, handle_arg_singlestep,