From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42779) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhDSK-0006ao-AZ for qemu-devel@nongnu.org; Tue, 06 Sep 2016 06:18:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bhDSG-0000qF-1U for qemu-devel@nongnu.org; Tue, 06 Sep 2016 06:18:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56780) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhDSF-0000qB-Po for qemu-devel@nongnu.org; Tue, 06 Sep 2016 06:18:11 -0400 From: "Dr. David Alan Gilbert (git)" Date: Tue, 6 Sep 2016 11:18:06 +0100 Message-Id: <1473157086-12062-1-git-send-email-dgilbert@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2] qom: Implement qom-get HMP command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, lcapitulino@redhat.com, afaerber@suse.de, armbru@redhat.com, pbonzini@redhat.com Cc: arei.gonglei@huawei.com, kwolf@redhat.com From: "Dr. David Alan Gilbert" This started off as Andreas F=C3=A4rber's implementation from March 2015, but after feedback from Paolo morphed into using the json output which handles structs reasonably. Use with qom-list to find the members of an object. (qemu) qom-get /backend/console[0]/device/vga.rom[0] size 65536 (qemu) qom-get /machine smm "auto" (qemu) qom-get /machine rtc-time { "tm_year": 116, "tm_sec": 0, "tm_hour": 9, "tm_min": 46, "tm_mon": 8, "tm_mday": 6 } (qemu) qom-get /machine frob Property '.frob' not found Signed-off-by: Dr. David Alan Gilbert -- v2 switched from using string-output-visitor to qobject_to_json_pretty, drop string-output-visitor patch. --- hmp-commands.hx | 13 +++++++++++++ hmp.c | 26 ++++++++++++++++++++++++++ hmp.h | 1 + 3 files changed, 40 insertions(+) diff --git a/hmp-commands.hx b/hmp-commands.hx index 848efee..73f0372 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1736,6 +1736,19 @@ Print QOM properties of object at location @var{pa= th} ETEXI =20 { + .name =3D "qom-get", + .args_type =3D "path:s,property:s", + .params =3D "path property", + .help =3D "print QOM property", + .mhandler.cmd =3D hmp_qom_get, + }, + +STEXI +@item qom-get @var{path} @var{property} +Print QOM property @var{property} of object at location @var{path} +ETEXI + + { .name =3D "qom-set", .args_type =3D "path:s,property:s,value:s", .params =3D "path property value", diff --git a/hmp.c b/hmp.c index cc2056e..88c659b 100644 --- a/hmp.c +++ b/hmp.c @@ -22,11 +22,13 @@ #include "qemu/option.h" #include "qemu/timer.h" #include "qmp-commands.h" +#include "qom/qom-qobject.h" #include "qemu/sockets.h" #include "monitor/monitor.h" #include "monitor/qdev.h" #include "qapi/opts-visitor.h" #include "qapi/qmp/qerror.h" +#include "qapi/qmp/qjson.h" #include "qapi/string-output-visitor.h" #include "qapi/util.h" #include "qapi-visit.h" @@ -2064,6 +2066,30 @@ void hmp_qom_list(Monitor *mon, const QDict *qdict= ) hmp_handle_error(mon, &err); } =20 +void hmp_qom_get(Monitor *mon, const QDict *qdict) +{ + const char *path =3D qdict_get_str(qdict, "path"); + const char *property =3D qdict_get_str(qdict, "property"); + Error *err =3D NULL; + Object *obj; + QObject *sub; + + obj =3D object_resolve_path(path, NULL); + if (obj =3D=3D NULL) { + error_set(&err, ERROR_CLASS_DEVICE_NOT_FOUND, + "Device '%s' not found", path); + hmp_handle_error(mon, &err); + return; + } + sub =3D object_property_get_qobject(obj, property, &err); + if (err =3D=3D NULL) { + QString *str =3D qobject_to_json_pretty(sub); + monitor_printf(mon, "%s\n", qstring_get_str(str)); + QDECREF(str); + } + hmp_handle_error(mon, &err); +} + void hmp_qom_set(Monitor *mon, const QDict *qdict) { const char *path =3D qdict_get_str(qdict, "path"); diff --git a/hmp.h b/hmp.h index 0876ec0..882f339 100644 --- a/hmp.h +++ b/hmp.h @@ -103,6 +103,7 @@ void hmp_object_del(Monitor *mon, const QDict *qdict)= ; void hmp_info_memdev(Monitor *mon, const QDict *qdict); void hmp_info_memory_devices(Monitor *mon, const QDict *qdict); void hmp_qom_list(Monitor *mon, const QDict *qdict); +void hmp_qom_get(Monitor *mon, const QDict *qdict); void hmp_qom_set(Monitor *mon, const QDict *qdict); void object_add_completion(ReadLineState *rs, int nb_args, const char *s= tr); void object_del_completion(ReadLineState *rs, int nb_args, const char *s= tr); --=20 2.7.4