From patchwork Wed Sep 6 17:55:00 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: 810743 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 3xnWTn3d6Mz9t43 for ; Thu, 7 Sep 2017 03:55:53 +1000 (AEST) Received: from localhost ([::1]:37336 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpeYH-0001ah-Tk for incoming@patchwork.ozlabs.org; Wed, 06 Sep 2017 13:55:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42605) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpeXj-0001Ya-RL for qemu-devel@nongnu.org; Wed, 06 Sep 2017 13:55:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpeXe-0002ZU-W2 for qemu-devel@nongnu.org; Wed, 06 Sep 2017 13:55:15 -0400 Received: from roura.ac.upc.es ([147.83.33.10]:47217) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpeXe-0002Yv-Ju for qemu-devel@nongnu.org; Wed, 06 Sep 2017 13:55:10 -0400 Received: from correu-2.ac.upc.es (correu-2.ac.upc.es [147.83.30.92]) by roura.ac.upc.es (8.13.8/8.13.8) with ESMTP id v86Ht7rv004480; Wed, 6 Sep 2017 19:55:07 +0200 Received: from localhost (unknown [31.210.187.58]) by correu-2.ac.upc.es (Postfix) with ESMTPSA id 68D2633A; Wed, 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 X-MIME-Autoconverted: from 8bit to quoted-printable by roura.ac.upc.es id v86Ht7rv004480 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: , 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 | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) diff --git a/hmp-commands.hx b/hmp-commands.hx index 1941e19932..703d7262f5 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 [arg]", + .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 = "handle", + .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 e0f880107f..8a7684f860 100644 --- a/monitor.c +++ b/monitor.c @@ -2319,6 +2319,66 @@ 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"); + const char *str = qdict_get_try_str(qdict, "args"); + strList args; + args.value = (str == NULL) ? NULL : (char *)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_TOO_MANY: + monitor_printf(mon, "Too many instrumentation libraries already loaded\n"); + break; + case INSTR_LOAD_CODE_ERROR: + monitor_printf(mon, "Instrumentation library returned a non-zero value during initialization"); + break; + case INSTR_LOAD_CODE_DLERROR: + monitor_printf(mon, "Error loading library: %s\n", res->msg); + break; + case INSTR_LOAD_CODE_UNAVAILABLE: + monitor_printf(mon, "Service not available\n"); + 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_INVALID: + monitor_printf(mon, "Invalid handle\n"); + break; + case INSTR_UNLOAD_CODE_DLERROR: + monitor_printf(mon, "Error unloading library: %s\n", res->msg); + break; + case INSTR_UNLOAD_CODE_UNAVAILABLE: + monitor_printf(mon, "Service not available\n"); + 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"