From patchwork Wed Sep 13 10:25:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Llu=C3=ADs_Vilanova?= X-Patchwork-Id: 9950911 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3EF6A60360 for ; Wed, 13 Sep 2017 10:27:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F14C22299 for ; Wed, 13 Sep 2017 10:27:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2343123B32; Wed, 13 Sep 2017 10:27:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9A0CF22299 for ; Wed, 13 Sep 2017 10:27:09 +0000 (UTC) Received: from localhost ([::1]:41382 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ds4su-0004ZM-SI for patchwork-qemu-devel@patchwork.kernel.org; Wed, 13 Sep 2017 06:27:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49633) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ds4s2-0004X9-6u for qemu-devel@nongnu.org; Wed, 13 Sep 2017 06:26:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ds4rw-000786-UQ for qemu-devel@nongnu.org; Wed, 13 Sep 2017 06:26:14 -0400 Received: from roura.ac.upc.es ([147.83.33.10]:39954) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ds4rw-00077S-Iu for qemu-devel@nongnu.org; Wed, 13 Sep 2017 06:26:08 -0400 Received: from correu-1.ac.upc.es (correu-1.ac.upc.es [147.83.30.91]) by roura.ac.upc.es (8.13.8/8.13.8) with ESMTP id v8DAQ5hI008607; Wed, 13 Sep 2017 12:26:05 +0200 Received: from localhost (unknown [132.68.137.204]) by correu-1.ac.upc.es (Postfix) with ESMTPSA id C522296A; Wed, 13 Sep 2017 12:25:59 +0200 (CEST) From: =?utf-8?b?TGx1w61z?= Vilanova To: qemu-devel@nongnu.org Date: Wed, 13 Sep 2017 13:25:58 +0300 Message-Id: <150529835846.10902.5108194050713694092.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 X-MIME-Autoconverted: from 8bit to quoted-printable by roura.ac.upc.es id v8DAQ5hI008607 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 08/22] instrument: [hmp] Add library loader X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Emilio G. Cota" , Markus Armbruster , Stefan Hajnoczi , "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Lluís Vilanova --- hmp-commands.hx | 32 ++++++++++++++++++++++++++++++++ monitor.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/hmp-commands.hx b/hmp-commands.hx index 1941e19932..2e8ebe8422 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1858,6 +1858,38 @@ ETEXI .sub_table = info_cmds, }, +#ifdef CONFIG_INSTRUMENT + { + .name = "instr-load", + .args_type = "path:F,id:s?,arg:s?", + .params = "path [id] [arg]", + .help = "load an instrumentation library", + .cmd = hmp_instr_load, + }, +#endif + +STEXI +@item instr-load @var{path} [@var{id}] [@var{arg}] +@findex instr-load +Load an instrumentation library. +ETEXI + +#ifdef CONFIG_INSTRUMENT + { + .name = "instr-unload", + .args_type = "id:s", + .params = "id", + .help = "unload an instrumentation library", + .cmd = hmp_instr_unload, + }, +#endif + +STEXI +@item instr-unload +@findex instr-unload +Unload an instrumentation library. +ETEXI + STEXI @end table ETEXI diff --git a/monitor.c b/monitor.c index e031aa2687..7b80d5351f 100644 --- a/monitor.c +++ b/monitor.c @@ -2323,6 +2323,45 @@ int monitor_fd_param(Monitor *mon, const char *fdname, Error **errp) return fd; } +#ifdef CONFIG_INSTRUMENT +static void hmp_instr_load(Monitor *mon, const QDict *qdict) +{ + Error *err = NULL; + const char *path = qdict_get_str(qdict, "path"); + const char *id = qdict_get_try_str(qdict, "id"); + const char *str = qdict_get_try_str(qdict, "arg"); + strList args; + + args.value = (char *)str; + args.next = NULL; + + InstrLoadResult *res = qmp_instr_load(path, + id != NULL, id, + args.value != NULL, &args, + &err); + if (err) { + error_report_err(err); + } else { + monitor_printf(mon, "Handle: %s\n", res->id); + monitor_printf(mon, "OK\n"); + } + qapi_free_InstrLoadResult(res); +} + +static void hmp_instr_unload(Monitor *mon, const QDict *qdict) +{ + Error *err = NULL; + const char *id = qdict_get_str(qdict, "id"); + + qmp_instr_unload(id, &err); + if (err) { + error_report_err(err); + } else { + monitor_printf(mon, "OK\n"); + } +} +#endif + /* Please update hmp-commands.hx when adding or changing commands */ static mon_cmd_t info_cmds[] = { #include "hmp-commands-info.h"