From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35847) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WiPCa-0006g8-9w for qemu-devel@nongnu.org; Thu, 08 May 2014 10:21:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WiPCL-0005vE-JW for qemu-devel@nongnu.org; Thu, 08 May 2014 10:21:36 -0400 Received: from cantor2.suse.de ([195.135.220.15]:52618 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WiPCL-0005uz-D3 for qemu-devel@nongnu.org; Thu, 08 May 2014 10:21:21 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 8 May 2014 16:21:16 +0200 Message-Id: <1399558877-4915-4-git-send-email-afaerber@suse.de> In-Reply-To: <1399558877-4915-1-git-send-email-afaerber@suse.de> References: <1399558877-4915-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH qom-next 3/4] qom: Implement qom-get HMP command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Luiz Capitulino Reimplement it based on qmp_qom_get() to avoid converting QObjects back to strings. Inspired-by: Paolo Bonzini Signed-off-by: Andreas F=C3=A4rber --- hmp-commands.hx | 13 +++++++++++++ hmp.c | 22 ++++++++++++++++++++++ hmp.h | 1 + 3 files changed, 36 insertions(+) diff --git a/hmp-commands.hx b/hmp-commands.hx index a0166af..c0603e9 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1691,6 +1691,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 "info", .args_type =3D "item:s?", .params =3D "[subcommand]", diff --git a/hmp.c b/hmp.c index 1c29c8a..d7d7a98 100644 --- a/hmp.c +++ b/hmp.c @@ -1693,3 +1693,25 @@ void hmp_qom_list(Monitor *mon, const QDict *qdict= ) } hmp_handle_error(mon, &err); } + +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; + char *value; + + obj =3D object_resolve_path(path, NULL); + if (obj =3D=3D NULL) { + error_set(&err, QERR_DEVICE_NOT_FOUND, path); + hmp_handle_error(mon, &err); + return; + } + value =3D object_property_print(obj, property, true, &err); + if (err =3D=3D NULL) { + monitor_printf(mon, "%s\n", value); + g_free(value); + } + hmp_handle_error(mon, &err); +} diff --git a/hmp.h b/hmp.h index 7ab969e..269d99e 100644 --- a/hmp.h +++ b/hmp.h @@ -94,6 +94,7 @@ void hmp_cpu_add(Monitor *mon, const QDict *qdict); void hmp_object_add(Monitor *mon, const QDict *qdict); void hmp_object_del(Monitor *mon, const QDict *qdict); void hmp_qom_list(Monitor *mon, const QDict *qdict); +void hmp_qom_get(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); void device_add_completion(ReadLineState *rs, int nb_args, const char *s= tr); --=20 1.8.4.5