From 92b3eeadd9bc72f1f4e5ba1f62a289dc0190e88f Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Thu, 10 Apr 2014 14:47:38 -0400 Subject: qom: Fix crash with qom-list and link properties MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 9561fda8d90e176bef598ba87c42a1bd6ad03ef7 changed the type of 'opaque' for link properties, but missed updating this call site. Reproducer: ./x86_64-softmmu/qemu-system-x86_64 -qmp unix:./qmp.sock,server & ./scripts/qmp/qmp-shell ./qmp.sock (QEMU) qom-list path=//machine/i440fx/pci.0/child[2] Reported-by: Marcin Gibuła Signed-off-by: Cole Robinson Message-id: 2f8f007ce2152ac3b65f0811199662799c509225.1397155389.git.crobinso@redhat.com Acked-by: Andreas Färber Signed-off-by: Peter Maydell --- qom/object.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'qom/object.c') diff --git a/qom/object.c b/qom/object.c index f4de619..9a730e7 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1225,7 +1225,8 @@ Object *object_resolve_path_component(Object *parent, const gchar *part) } if (object_property_is_link(prop)) { - return *(Object **)prop->opaque; + LinkProperty *lprop = prop->opaque; + return *lprop->child; } else if (object_property_is_child(prop)) { return prop->opaque; } else { -- cgit v1.1