From patchwork Mon Jul 24 17:50:52 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: 792937 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xGTTK1FFkz9s3w for ; Tue, 25 Jul 2017 03:51:49 +1000 (AEST) Received: from localhost ([::1]:56166 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZhWE-00053F-Ut for incoming@patchwork.ozlabs.org; Mon, 24 Jul 2017 13:51:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41417) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZhVb-00051K-MW for qemu-devel@nongnu.org; Mon, 24 Jul 2017 13:51:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dZhVW-00060x-R1 for qemu-devel@nongnu.org; Mon, 24 Jul 2017 13:51:07 -0400 Received: from roura.ac.upc.es ([147.83.33.10]:35840) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZhVW-00060i-Ec for qemu-devel@nongnu.org; Mon, 24 Jul 2017 13:51:02 -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 v6OHoxFJ000751; Mon, 24 Jul 2017 19:50:59 +0200 Received: from localhost (unknown [31.210.188.120]) by correu-1.ac.upc.es (Postfix) with ESMTPSA id CD41D176C; Mon, 24 Jul 2017 19:50:53 +0200 (CEST) From: =?utf-8?b?TGx1w61z?= Vilanova To: qemu-devel@nongnu.org Date: Mon, 24 Jul 2017 20:50:52 +0300 Message-Id: <150091865221.30739.8093437461715631283.stgit@frigg.lan> X-Mailer: git-send-email 2.13.2 In-Reply-To: <150091574424.30739.4131793221953168474.stgit@frigg.lan> References: <150091574424.30739.4131793221953168474.stgit@frigg.lan> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-MIME-Autoconverted: from 8bit to quoted-printable by roura.ac.upc.es id v6OHoxFJ000751 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 12/13] 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" , "Dr. David Alan Gilbert" , Stefan Hajnoczi , Markus Armbruster Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Lluís Vilanova --- hmp-commands.hx | 28 ++++++++++++++++++++++++++++ monitor.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+) diff --git a/hmp-commands.hx b/hmp-commands.hx index 1941e19932..b1f3a75ab0 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1858,6 +1858,34 @@ ETEXI .sub_table = info_cmds, }, + { + .name = "instr-load", + .args_type = "path:F,args:s?", + .params = "path [args]", + .help = "load an instrumentation library", + .cmd = hmp_instr_load, + }, + +STEXI +@item instr-load @var{path} [args=value[,...]] +@findex instr-load +Load an instrumentation library. +ETEXI + + { + .name = "instr-unload", + .args_type = "handle:i", + .params = "", + .help = "unload an instrumentation library", + .cmd = hmp_instr_unload, + }, + +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 6d040e620f..4784356798 100644 --- a/monitor.c +++ b/monitor.c @@ -2319,6 +2319,61 @@ int monitor_fd_param(Monitor *mon, const char *fdname, Error **errp) return fd; } +static void hmp_instr_load(Monitor *mon, const QDict *qdict) +{ + const char *path = qdict_get_str(qdict, "path"); + String str; + str.str = (char *)qdict_get_try_str(qdict, "args"); + StringList args; + args.value = str.str == NULL ? NULL : &str; + args.next = NULL; + InstrLoadResult *res = qmp_instr_load(path, args.value != NULL, + args.value != NULL ? &args : NULL, + NULL); + switch (res->code) { + case INSTR_LOAD_CODE_OK: + monitor_printf(mon, "Handle: %"PRId64"\n", res->handle); + monitor_printf(mon, "OK\n"); + break; + case INSTR_LOAD_CODE_UNAVAILABLE: + monitor_printf(mon, "Not available\n"); + break; + case INSTR_LOAD_CODE_ERROR: + monitor_printf(mon, "Error loading library: %s\n", res->msg); + break; + default: + fprintf(stderr, "Unknown instrumentation load code: %d", res->code); + exit(1); + break; + } + qapi_free_InstrLoadResult(res); +} + +static void hmp_instr_unload(Monitor *mon, const QDict *qdict) +{ + int64_t handle = qdict_get_int(qdict, "handle"); + InstrUnloadResult *res = qmp_instr_unload(handle, NULL); + switch (res->code) { + case INSTR_UNLOAD_CODE_OK: + monitor_printf(mon, "OK\n"); + break; + case INSTR_UNLOAD_CODE_UNAVAILABLE: + monitor_printf(mon, "Not available\n"); + break; + case INSTR_UNLOAD_CODE_INVALID: + monitor_printf(mon, "Invalid handle\n"); + break; + case INSTR_UNLOAD_CODE_ERROR: + monitor_printf(mon, "Error unloading library: %s\n", res->msg); + break; + default: + fprintf(stderr, "Unknown instrumentation unload code: %d", res->code); + exit(1); + break; + } + qapi_free_InstrUnloadResult(res); +} + /* Please update hmp-commands.hx when adding or changing commands */ static mon_cmd_t info_cmds[] = { #include "hmp-commands-info.h"