From: Cole Robinson <crobinso@redhat.com>
Date: Thu, 10 Apr 2014 18:47:38 +0000 (-0400)
Subject: qom: Fix crash with qom-list and link properties
X-Git-Tag: qemu-xen-4.5.0-rc1~32
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=92b3eeadd9bc72f1f4e5ba1f62a289dc0190e88f;p=qemu-upstream-4.5-testing.git

qom: Fix crash with qom-list and link properties

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 <m.gibula@beyond.pl>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
Message-id: 2f8f007ce2152ac3b65f0811199662799c509225.1397155389.git.crobinso@redhat.com
Acked-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

diff --git a/qom/object.c b/qom/object.c
index f4de619b7..9a730e74c 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 {