{"id":810743,"url":"http://patchwork.ozlabs.org/api/patches/810743/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/150472050004.24907.4613952373869620144.stgit@frigg.lan/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/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":"<150472050004.24907.4613952373869620144.stgit@frigg.lan>","list_archive_url":null,"date":"2017-09-06T17:55:00","name":"[v4,08/20] instrument: [hmp] Add library loader","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"231ad5a301b607a1a39b6b67882682c817cbdb0f","submitter":{"id":9099,"url":"http://patchwork.ozlabs.org/api/people/9099/?format=json","name":"Lluís Vilanova","email":"vilanova@ac.upc.edu"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/150472050004.24907.4613952373869620144.stgit@frigg.lan/mbox/","series":[{"id":1859,"url":"http://patchwork.ozlabs.org/api/series/1859/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1859","date":"2017-09-06T17:22:41","name":"instrument: Add basic event instrumentation","version":4,"mbox":"http://patchwork.ozlabs.org/series/1859/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810743/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810743/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 3xnWTn3d6Mz9t43\n\tfor ;\n\tThu, 7 Sep 2017 03:55:53 +1000 (AEST)","from localhost ([::1]:37336 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dpeYH-0001ah-Tk\n\tfor incoming@patchwork.ozlabs.org; Wed, 06 Sep 2017 13:55:49 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:42605)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dpeXj-0001Ya-RL\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 13:55:16 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dpeXe-0002ZU-W2\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 13:55:15 -0400","from roura.ac.upc.es ([147.83.33.10]:47217)\n\tby eggs.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dpeXe-0002Yv-Ju\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 13:55:10 -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 v86Ht7rv004480;\n\tWed, 6 Sep 2017 19:55:07 +0200","from localhost (unknown [31.210.187.58])\n\tby correu-2.ac.upc.es (Postfix) with ESMTPSA id 68D2633A;\n\tWed, 6 Sep 2017 19:55:01 +0200 (CEST)"],"From":"=?utf-8?b?TGx1w61z?= Vilanova ","To":"qemu-devel@nongnu.org","Date":"Wed, 6 Sep 2017 20:55:00 +0300","Message-Id":"<150472050004.24907.4613952373869620144.stgit@frigg.lan>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"<150471856141.24907.274176769201097378.stgit@frigg.lan>","References":"<150471856141.24907.274176769201097378.stgit@frigg.lan>","User-Agent":"StGit/0.17.1-dirty","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\tv86Ht7rv004480","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 v4 08/20] instrument: [hmp] Add 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":"\"Emilio G. Cota\" ,\n\t\"Dr. David Alan Gilbert\" ,\n\tStefan Hajnoczi ,\n\tMarkus Armbruster ","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 hmp-commands.hx | 28 ++++++++++++++++++++++++++\n monitor.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++\n 2 files changed, 88 insertions(+)","diff":"diff --git a/hmp-commands.hx b/hmp-commands.hx\nindex 1941e19932..703d7262f5 100644\n--- a/hmp-commands.hx\n+++ b/hmp-commands.hx\n@@ -1858,6 +1858,34 @@ ETEXI\n .sub_table = info_cmds,\n },\n \n+ {\n+ .name = \"instr-load\",\n+ .args_type = \"path:F,args:s?\",\n+ .params = \"path [arg]\",\n+ .help = \"load an instrumentation library\",\n+ .cmd = hmp_instr_load,\n+ },\n+\n+STEXI\n+@item instr-load @var{path} [args=value[,...]]\n+@findex instr-load\n+Load an instrumentation library.\n+ETEXI\n+\n+ {\n+ .name = \"instr-unload\",\n+ .args_type = \"handle:i\",\n+ .params = \"handle\",\n+ .help = \"unload an instrumentation library\",\n+ .cmd = hmp_instr_unload,\n+ },\n+\n+STEXI\n+@item instr-unload\n+@findex instr-unload\n+Unload an instrumentation library.\n+ETEXI\n+\n STEXI\n @end table\n ETEXI\ndiff --git a/monitor.c b/monitor.c\nindex e0f880107f..8a7684f860 100644\n--- a/monitor.c\n+++ b/monitor.c\n@@ -2319,6 +2319,66 @@ int monitor_fd_param(Monitor *mon, const char *fdname, Error **errp)\n return fd;\n }\n \n+static void hmp_instr_load(Monitor *mon, const QDict *qdict)\n+{\n+ const char *path = qdict_get_str(qdict, \"path\");\n+ const char *str = qdict_get_try_str(qdict, \"args\");\n+ strList args;\n+ args.value = (str == NULL) ? NULL : (char *)str;\n+ args.next = NULL;\n+ InstrLoadResult *res = qmp_instr_load(path, args.value != NULL,\n+ args.value != NULL ? &args : NULL,\n+ NULL);\n+ switch (res->code) {\n+ case INSTR_LOAD_CODE_OK:\n+ monitor_printf(mon, \"Handle: %\"PRId64\"\\n\", res->handle);\n+ monitor_printf(mon, \"OK\\n\");\n+ break;\n+ case INSTR_LOAD_CODE_TOO_MANY:\n+ monitor_printf(mon, \"Too many instrumentation libraries already loaded\\n\");\n+ break;\n+ case INSTR_LOAD_CODE_ERROR:\n+ monitor_printf(mon, \"Instrumentation library returned a non-zero value during initialization\");\n+ break;\n+ case INSTR_LOAD_CODE_DLERROR:\n+ monitor_printf(mon, \"Error loading library: %s\\n\", res->msg);\n+ break;\n+ case INSTR_LOAD_CODE_UNAVAILABLE:\n+ monitor_printf(mon, \"Service not available\\n\");\n+ break;\n+ default:\n+ fprintf(stderr, \"Unknown instrumentation load code: %d\", res->code);\n+ exit(1);\n+ break;\n+ }\n+ qapi_free_InstrLoadResult(res);\n+}\n+\n+static void hmp_instr_unload(Monitor *mon, const QDict *qdict)\n+{\n+ int64_t handle = qdict_get_int(qdict, \"handle\");\n+ InstrUnloadResult *res = qmp_instr_unload(handle, NULL);\n+ switch (res->code) {\n+ case INSTR_UNLOAD_CODE_OK:\n+ monitor_printf(mon, \"OK\\n\");\n+ break;\n+ case INSTR_UNLOAD_CODE_INVALID:\n+ monitor_printf(mon, \"Invalid handle\\n\");\n+ break;\n+ case INSTR_UNLOAD_CODE_DLERROR:\n+ monitor_printf(mon, \"Error unloading library: %s\\n\", res->msg);\n+ break;\n+ case INSTR_UNLOAD_CODE_UNAVAILABLE:\n+ monitor_printf(mon, \"Service not available\\n\");\n+ break;\n+ default:\n+ fprintf(stderr, \"Unknown instrumentation unload code: %d\", res->code);\n+ exit(1);\n+ break;\n+ }\n+ qapi_free_InstrUnloadResult(res);\n+}\n+\n /* Please update hmp-commands.hx when adding or changing commands */\n static mon_cmd_t info_cmds[] = {\n #include \"hmp-commands-info.h\"\n","prefixes":["v4","08/20"]}