From nobody Tue Feb 10 01:19:31 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1504720596730492.86777211101196; Wed, 6 Sep 2017 10:56:36 -0700 (PDT) Received: from localhost ([::1]:37338 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpeZ1-0002BC-Ho for importer@patchew.org; Wed, 06 Sep 2017 13:56:35 -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 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 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Llu=C3=ADs 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 =3D info_cmds, }, =20 + { + .name =3D "instr-load", + .args_type =3D "path:F,args:s?", + .params =3D "path [arg]", + .help =3D "load an instrumentation library", + .cmd =3D hmp_instr_load, + }, + +STEXI +@item instr-load @var{path} [args=3Dvalue[,...]] +@findex instr-load +Load an instrumentation library. +ETEXI + + { + .name =3D "instr-unload", + .args_type =3D "handle:i", + .params =3D "handle", + .help =3D "unload an instrumentation library", + .cmd =3D 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 *fdnam= e, Error **errp) return fd; } =20 +static void hmp_instr_load(Monitor *mon, const QDict *qdict) +{ + const char *path =3D qdict_get_str(qdict, "path"); + const char *str =3D qdict_get_try_str(qdict, "args"); + strList args; + args.value =3D (str =3D=3D NULL) ? NULL : (char *)str; + args.next =3D NULL; + InstrLoadResult *res =3D qmp_instr_load(path, args.value !=3D NULL, + args.value !=3D NULL ? &args : N= ULL, + 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 lo= aded\n"); + break; + case INSTR_LOAD_CODE_ERROR: + monitor_printf(mon, "Instrumentation library returned a non-zero v= alue 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 =3D qdict_get_int(qdict, "handle"); + InstrUnloadResult *res =3D 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->co= de); + exit(1); + break; + } + qapi_free_InstrUnloadResult(res); +} + /* Please update hmp-commands.hx when adding or changing commands */ static mon_cmd_t info_cmds[] =3D { #include "hmp-commands-info.h"