mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 16:23:55 -06:00
qom: Move HMP command handlers to qom/
Move the HMP command handlers related to QOM handlers from monitor/hmp-cmds.c and qdev-monitor.c to new qom/qom-hmp-cmds.c, where they are covered by MAINTAINERS section QOM. Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: "Daniel P. Berrange" <berrange@redhat.com> Cc: Eduardo Habkost <ehabkost@redhat.com> Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20190619201050.19040-7-armbru@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> [Also move hmp_info_qom_tree(), tweak commit message accordingly]
This commit is contained in:
parent
cfbe46fcc6
commit
3950a37716
6 changed files with 125 additions and 108 deletions
120
qom/qom-hmp-cmds.c
Normal file
120
qom/qom-hmp-cmds.c
Normal file
|
@ -0,0 +1,120 @@
|
|||
/*
|
||||
* HMP commands related to QOM
|
||||
*
|
||||
* This work is licensed under the terms of the GNU GPL, version 2 or
|
||||
* later. See the COPYING file in the top-level directory.
|
||||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "hw/qdev-core.h"
|
||||
#include "monitor/hmp.h"
|
||||
#include "monitor/monitor.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qapi/qapi-commands-qom.h"
|
||||
#include "qapi/qmp/qdict.h"
|
||||
#include "qom/object.h"
|
||||
|
||||
void hmp_qom_list(Monitor *mon, const QDict *qdict)
|
||||
{
|
||||
const char *path = qdict_get_try_str(qdict, "path");
|
||||
ObjectPropertyInfoList *list;
|
||||
Error *err = NULL;
|
||||
|
||||
if (path == NULL) {
|
||||
monitor_printf(mon, "/\n");
|
||||
return;
|
||||
}
|
||||
|
||||
list = qmp_qom_list(path, &err);
|
||||
if (err == NULL) {
|
||||
ObjectPropertyInfoList *start = list;
|
||||
while (list != NULL) {
|
||||
ObjectPropertyInfo *value = list->value;
|
||||
|
||||
monitor_printf(mon, "%s (%s)\n",
|
||||
value->name, value->type);
|
||||
list = list->next;
|
||||
}
|
||||
qapi_free_ObjectPropertyInfoList(start);
|
||||
}
|
||||
hmp_handle_error(mon, &err);
|
||||
}
|
||||
|
||||
void hmp_qom_set(Monitor *mon, const QDict *qdict)
|
||||
{
|
||||
const char *path = qdict_get_str(qdict, "path");
|
||||
const char *property = qdict_get_str(qdict, "property");
|
||||
const char *value = qdict_get_str(qdict, "value");
|
||||
Error *err = NULL;
|
||||
bool ambiguous = false;
|
||||
Object *obj;
|
||||
|
||||
obj = object_resolve_path(path, &ambiguous);
|
||||
if (obj == NULL) {
|
||||
error_set(&err, ERROR_CLASS_DEVICE_NOT_FOUND,
|
||||
"Device '%s' not found", path);
|
||||
} else {
|
||||
if (ambiguous) {
|
||||
monitor_printf(mon, "Warning: Path '%s' is ambiguous\n", path);
|
||||
}
|
||||
object_property_parse(obj, value, property, &err);
|
||||
}
|
||||
hmp_handle_error(mon, &err);
|
||||
}
|
||||
|
||||
typedef struct QOMCompositionState {
|
||||
Monitor *mon;
|
||||
int indent;
|
||||
} QOMCompositionState;
|
||||
|
||||
static void print_qom_composition(Monitor *mon, Object *obj, int indent);
|
||||
|
||||
static int print_qom_composition_child(Object *obj, void *opaque)
|
||||
{
|
||||
QOMCompositionState *s = opaque;
|
||||
|
||||
print_qom_composition(s->mon, obj, s->indent);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void print_qom_composition(Monitor *mon, Object *obj, int indent)
|
||||
{
|
||||
QOMCompositionState s = {
|
||||
.mon = mon,
|
||||
.indent = indent + 2,
|
||||
};
|
||||
char *name;
|
||||
|
||||
if (obj == object_get_root()) {
|
||||
name = g_strdup("");
|
||||
} else {
|
||||
name = object_get_canonical_path_component(obj);
|
||||
}
|
||||
monitor_printf(mon, "%*s/%s (%s)\n", indent, "", name,
|
||||
object_get_typename(obj));
|
||||
g_free(name);
|
||||
object_child_foreach(obj, print_qom_composition_child, &s);
|
||||
}
|
||||
|
||||
void hmp_info_qom_tree(Monitor *mon, const QDict *dict)
|
||||
{
|
||||
const char *path = qdict_get_try_str(dict, "path");
|
||||
Object *obj;
|
||||
bool ambiguous = false;
|
||||
|
||||
if (path) {
|
||||
obj = object_resolve_path(path, &ambiguous);
|
||||
if (!obj) {
|
||||
monitor_printf(mon, "Path '%s' could not be resolved.\n", path);
|
||||
return;
|
||||
}
|
||||
if (ambiguous) {
|
||||
monitor_printf(mon, "Warning: Path '%s' is ambiguous.\n", path);
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
obj = qdev_get_machine();
|
||||
}
|
||||
print_qom_composition(mon, obj, 0);
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue