Message ID | 1426178624-32638-7-git-send-email-afaerber@suse.de |
---|---|
State | New |
Headers | show |
On 2015/3/13 0:43, Andreas Färber wrote: > Reimplement it based on qmp_qom_get() to avoid converting QObjects back > to strings. > > Inspired-by: Paolo Bonzini <pbonzini@redhat.com> > Signed-off-by: Andreas Färber <afaerber@suse.de> > --- > hmp-commands.hx | 13 +++++++++++++ > hmp.c | 22 ++++++++++++++++++++++ > hmp.h | 1 + > 3 files changed, 36 insertions(+) > Reviewed-by: Gonglei <arei.gonglei@huawei.com> > diff --git a/hmp-commands.hx b/hmp-commands.hx > index 3c1915a..6fb6bdb 100644 > --- a/hmp-commands.hx > +++ b/hmp-commands.hx > @@ -1671,6 +1671,19 @@ Print QOM properties of object at location @var{path} > ETEXI > > { > + .name = "qom-get", > + .args_type = "path:s,property:s", > + .params = "path property", > + .help = "print QOM property", > + .mhandler.cmd = hmp_qom_get, > + }, > + > +STEXI > +@item qom-get @var{path} @var{property} > +Print QOM property @var{property} of object at location @var{path} > +ETEXI > + > + { > .name = "qom-set", > .args_type = "path:s,property:s,value:s", > .params = "path property value", > diff --git a/hmp.c b/hmp.c > index 811f9a3..6db4005 100644 > --- a/hmp.c > +++ b/hmp.c > @@ -1879,6 +1879,28 @@ 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 = qdict_get_str(qdict, "path"); > + const char *property = qdict_get_str(qdict, "property"); > + Error *err = NULL; > + Object *obj; > + char *value; > + > + obj = object_resolve_path(path, NULL); > + if (obj == NULL) { > + error_set(&err, QERR_DEVICE_NOT_FOUND, path); > + hmp_handle_error(mon, &err); > + return; > + } > + value = object_property_print(obj, property, true, &err); > + if (err == NULL) { > + monitor_printf(mon, "%s\n", value); > + g_free(value); > + } > + hmp_handle_error(mon, &err); > +} > + > void hmp_qom_set(Monitor *mon, const QDict *qdict) > { > const char *path = qdict_get_str(qdict, "path"); > diff --git a/hmp.h b/hmp.h > index 44049e8..a4d0ae4 100644 > --- a/hmp.h > +++ b/hmp.h > @@ -96,6 +96,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 *str); > void object_del_completion(ReadLineState *rs, int nb_args, const char *str); >
diff --git a/hmp-commands.hx b/hmp-commands.hx index 3c1915a..6fb6bdb 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1671,6 +1671,19 @@ Print QOM properties of object at location @var{path} ETEXI { + .name = "qom-get", + .args_type = "path:s,property:s", + .params = "path property", + .help = "print QOM property", + .mhandler.cmd = hmp_qom_get, + }, + +STEXI +@item qom-get @var{path} @var{property} +Print QOM property @var{property} of object at location @var{path} +ETEXI + + { .name = "qom-set", .args_type = "path:s,property:s,value:s", .params = "path property value", diff --git a/hmp.c b/hmp.c index 811f9a3..6db4005 100644 --- a/hmp.c +++ b/hmp.c @@ -1879,6 +1879,28 @@ 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 = qdict_get_str(qdict, "path"); + const char *property = qdict_get_str(qdict, "property"); + Error *err = NULL; + Object *obj; + char *value; + + obj = object_resolve_path(path, NULL); + if (obj == NULL) { + error_set(&err, QERR_DEVICE_NOT_FOUND, path); + hmp_handle_error(mon, &err); + return; + } + value = object_property_print(obj, property, true, &err); + if (err == NULL) { + monitor_printf(mon, "%s\n", value); + g_free(value); + } + hmp_handle_error(mon, &err); +} + void hmp_qom_set(Monitor *mon, const QDict *qdict) { const char *path = qdict_get_str(qdict, "path"); diff --git a/hmp.h b/hmp.h index 44049e8..a4d0ae4 100644 --- a/hmp.h +++ b/hmp.h @@ -96,6 +96,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 *str); void object_del_completion(ReadLineState *rs, int nb_args, const char *str);
Reimplement it based on qmp_qom_get() to avoid converting QObjects back to strings. Inspired-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de> --- hmp-commands.hx | 13 +++++++++++++ hmp.c | 22 ++++++++++++++++++++++ hmp.h | 1 + 3 files changed, 36 insertions(+)