{"id":813304,"url":"http://patchwork.ozlabs.org/api/1.2/patches/813304/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/150529739097.10902.15025735917991693713.stgit@frigg.lan/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<150529739097.10902.15025735917991693713.stgit@frigg.lan>","list_archive_url":null,"date":"2017-09-13T10:09:51","name":"[v6,04/22] instrument: [linux-user] Add command line library loader","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"dac0670dbeffdf9e80ee687383a84f25f885b280","submitter":{"id":9099,"url":"http://patchwork.ozlabs.org/api/1.2/people/9099/?format=json","name":"Lluís Vilanova","email":"vilanova@ac.upc.edu"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/150529739097.10902.15025735917991693713.stgit@frigg.lan/mbox/","series":[{"id":2857,"url":"http://patchwork.ozlabs.org/api/1.2/series/2857/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2857","date":"2017-09-13T09:53:43","name":"instrument: Add basic event instrumentation","version":6,"mbox":"http://patchwork.ozlabs.org/series/2857/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/813304/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813304/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xscqc0fqTz9sPm\n\tfor ;\n\tWed, 13 Sep 2017 20:10:36 +1000 (AEST)","from localhost ([::1]:41327 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1ds4cs-0006JM-5F\n\tfor incoming@patchwork.ozlabs.org; Wed, 13 Sep 2017 06:10:34 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:40799)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1ds4cW-0006HB-T1\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 06:10:14 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1ds4cS-0003Ua-PL\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 06:10:12 -0400","from roura.ac.upc.es ([147.83.33.10]:59112)\n\tby eggs.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1ds4cS-0003T6-Dd\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 06:10:08 -0400","from correu-2.ac.upc.es (correu-2.ac.upc.es [147.83.30.92])\n\tby roura.ac.upc.es (8.13.8/8.13.8) with ESMTP id v8DA9vrZ008106;\n\tWed, 13 Sep 2017 12:09:57 +0200","from localhost (unknown [132.68.137.204])\n\tby correu-2.ac.upc.es (Postfix) with ESMTPSA id 4ADC4149;\n\tWed, 13 Sep 2017 12:09:52 +0200 (CEST)"],"From":"=?utf-8?b?TGx1w61z?= Vilanova ","To":"qemu-devel@nongnu.org","Date":"Wed, 13 Sep 2017 13:09:51 +0300","Message-Id":"<150529739097.10902.15025735917991693713.stgit@frigg.lan>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"<150529642278.10902.18234057937634437857.stgit@frigg.lan>","References":"<150529642278.10902.18234057937634437857.stgit@frigg.lan>","User-Agent":"StGit/0.18","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"quoted-printable","X-MIME-Autoconverted":"from 8bit to quoted-printable by roura.ac.upc.es id\n\tv8DA9vrZ008106","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.6.x [fuzzy]","X-Received-From":"147.83.33.10","Subject":"[Qemu-devel] [PATCH v6 04/22] instrument: [linux-user] Add command\n\tline library loader","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Riku Voipio , Markus Armbruster , \n\tLaurent Vivier , \"Emilio G. Cota\" ,\n\tStefan Hajnoczi ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Signed-off-by: Lluís Vilanova \n---\n linux-user/main.c | 21 +++++++++++++++++++++\n linux-user/syscall.c | 4 ++++\n 2 files changed, 25 insertions(+)","diff":"diff --git a/linux-user/main.c b/linux-user/main.c\nindex 03666ef657..ac5c30c1fb 100644\n--- a/linux-user/main.c\n+++ b/linux-user/main.c\n@@ -36,6 +36,7 @@\n #include \"exec/log.h\"\n #include \"trace/control.h\"\n #include \"glib-compat.h\"\n+#include \"instrument/cmdline.h\"\n \n char *exec_path;\n \n@@ -4017,6 +4018,17 @@ static void handle_arg_trace(const char *arg)\n trace_file = trace_opt_parse(arg);\n }\n \n+static char *instrument_path;\n+static int instrument_argc;\n+static const char **instrument_argv;\n+#if defined(CONFIG_INSTRUMENT)\n+static void handle_arg_instrument(const char *arg)\n+{\n+ instr_opt_parse(arg, &instrument_path,\n+ &instrument_argc, &instrument_argv);\n+}\n+#endif\n+\n struct qemu_argument {\n const char *argv;\n const char *env;\n@@ -4066,6 +4078,10 @@ static const struct qemu_argument arg_table[] = {\n \"\", \"Seed for pseudo-random number generator\"},\n {\"trace\", \"QEMU_TRACE\", true, handle_arg_trace,\n \"\", \"[[enable=]][,events=][,file=]\"},\n+#if defined(CONFIG_INSTRUMENT)\n+ {\"instr\", \"QEMU_INSTR\", true, handle_arg_instrument,\n+ \"\", \"[file=][,arg=]\"},\n+#endif\n {\"version\", \"QEMU_VERSION\", false, handle_arg_version,\n \"\", \"display version information and exit\"},\n {NULL, NULL, false, NULL, NULL, NULL}\n@@ -4257,6 +4273,9 @@ int main(int argc, char **argv, char **envp)\n srand(time(NULL));\n \n qemu_add_opts(&qemu_trace_opts);\n+#if defined(CONFIG_INSTRUMENT)\n+ qemu_add_opts(&qemu_instr_opts);\n+#endif\n \n optind = parse_args(argc, argv);\n \n@@ -4265,6 +4284,8 @@ int main(int argc, char **argv, char **envp)\n }\n trace_init_file(trace_file);\n \n+ instr_init(instrument_path, instrument_argc, instrument_argv);\n+\n /* Zero out regs */\n memset(regs, 0, sizeof(struct target_pt_regs));\n \ndiff --git a/linux-user/syscall.c b/linux-user/syscall.c\nindex 9b6364a266..e73a07fa6f 100644\n--- a/linux-user/syscall.c\n+++ b/linux-user/syscall.c\n@@ -115,6 +115,8 @@ int __clone2(int (*fn)(void *), void *child_stack_base,\n #include \"uname.h\"\n \n #include \"qemu.h\"\n+#include \"instrument/cmdline.h\"\n+\n \n #ifndef CLONE_IO\n #define CLONE_IO 0x80000000 /* Clone io context */\n@@ -7765,6 +7767,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,\n _mcleanup();\n #endif\n gdb_exit(cpu_env, arg1);\n+ instr_fini();\n _exit(arg1);\n ret = 0; /* avoid warning */\n break;\n@@ -9821,6 +9824,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,\n _mcleanup();\n #endif\n gdb_exit(cpu_env, arg1);\n+ instr_fini();\n ret = get_errno(exit_group(arg1));\n break;\n #endif\n","prefixes":["v6","04/22"]}