diff options
author | Markus Armbruster <armbru@redhat.com> | 2021-10-19 10:57:11 +0200 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2021-11-10 06:14:51 +0100 |
commit | 1bf4d3294bd48b702530b131e3344860495425fd (patch) | |
tree | 96d79ed8d3bcf780ce4df4e61552b616b81437c9 /qom/object.c | |
parent | 0a70bcf18caf7a61d480f8448723c15209d128ef (diff) | |
download | qemu-1bf4d3294bd48b702530b131e3344860495425fd.zip qemu-1bf4d3294bd48b702530b131e3344860495425fd.tar.gz qemu-1bf4d3294bd48b702530b131e3344860495425fd.tar.bz2 |
monitor: Fix find_device_state() for IDs containing slashes
Recent commit 6952026120 "monitor: Tidy up find_device_state()"
assumed the function's argument is "the device's ID or QOM path" (as
documented for device_del). It's actually either an absolute QOM
path, or a QOM path relative to /machine/peripheral/. Such a relative
path is a device ID when it doesn't contain a slash. When it does,
the function now always fails. Broke iotest 200, which uses relative
path "vda/virtio-backend".
It fails because object_resolve_path_component() resolves just one
component, not a relative path.
The obvious function to resolve relative paths is
object_resolve_path(). It picks a parent automatically. Too much
magic, we want to specify the parent. Create new
object_resolve_path_at() for that, and use it in find_device_state().
Reported-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20211019085711.86377-1-armbru@redhat.com>
Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'qom/object.c')
-rw-r--r-- | qom/object.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/qom/object.c b/qom/object.c index 6be710b..4f0677c 100644 --- a/qom/object.c +++ b/qom/object.c @@ -2144,6 +2144,17 @@ Object *object_resolve_path(const char *path, bool *ambiguous) return object_resolve_path_type(path, TYPE_OBJECT, ambiguous); } +Object *object_resolve_path_at(Object *parent, const char *path) +{ + g_auto(GStrv) parts = g_strsplit(path, "/", 0); + + if (*path == '/') { + return object_resolve_abs_path(object_get_root(), parts + 1, + TYPE_OBJECT); + } + return object_resolve_abs_path(parent, parts, TYPE_OBJECT); +} + typedef struct StringProperty { char *(*get)(Object *, Error **); |