diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-03-17 15:23:23 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-03-17 15:23:23 +0000 |
| commit | 1a87e52770ca64f5a09e9c46d29ea3b5a5db5ffd (patch) | |
| tree | 905e1bf4bbf8f48e435097807e8c49d67f7262da /hw/core/qdev.c | |
| parent | 5a4992834daec85c3913654903fb9f4f954e585a (diff) | |
| parent | 88950eeff59834b3b4bea98b954a3fe854468ae3 (diff) | |
| download | focaccia-qemu-1a87e52770ca64f5a09e9c46d29ea3b5a5db5ffd.tar.gz focaccia-qemu-1a87e52770ca64f5a09e9c46d29ea3b5a5db5ffd.zip | |
Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging
QOM infrastructure fixes and device conversions * Conversion of cadence_uart to QOM realize * qom-tree QMP script * qom-list and qom-set HMP commands to match their QMP counterparts * Basic qom-tree HMP command * Cleanups for /machine QOM composition tree # gpg: Signature made Tue Mar 17 15:02:57 2015 GMT using RSA key ID 3E7E013F # gpg: Good signature from "Andreas Färber <afaerber@suse.de>" # gpg: aka "Andreas Färber <afaerber@suse.com>" * remotes/afaerber/tags/qom-devices-for-peter: qdev: Move owner-less IRQs to /machine/unattached memory: Move owner-less MemoryRegions to /machine/unattached qom: Implement info qom-tree HMP command qom: Implement qom-set HMP command qom: Implement qom-list HMP command scripts: Add qom-tree script cadence_uart: Convert to QOM realize() Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/core/qdev.c')
| -rw-r--r-- | hw/core/qdev.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 6be58669f7..6e6a65d49b 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -501,8 +501,9 @@ void qdev_connect_gpio_out_named(DeviceState *dev, const char *name, int n, * with an error without doing anything. If it has none, it will * never fail. So we can just call it with a NULL Error pointer. */ - object_property_add_child(qdev_get_machine(), "non-qdev-gpio[*]", - OBJECT(pin), NULL); + object_property_add_child(container_get(qdev_get_machine(), + "/unattached"), + "non-qdev-gpio[*]", OBJECT(pin), NULL); } object_property_set_link(OBJECT(dev), OBJECT(pin), propname, &error_abort); g_free(propname); |