diff options
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/qdev-monitor.c | 4 | ||||
| -rw-r--r-- | hw/qdev.c | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c index 81d654827f..dc4e4e1b84 100644 --- a/hw/qdev-monitor.c +++ b/hw/qdev-monitor.c @@ -181,7 +181,7 @@ static Object *qdev_get_peripheral(void) static Object *dev; if (dev == NULL) { - dev = container_get("/machine/peripheral"); + dev = container_get(qdev_get_machine(), "/peripheral"); } return dev; @@ -192,7 +192,7 @@ static Object *qdev_get_peripheral_anon(void) static Object *dev; if (dev == NULL) { - dev = container_get("/machine/peripheral-anon"); + dev = container_get(qdev_get_machine(), "/peripheral-anon"); } return dev; diff --git a/hw/qdev.c b/hw/qdev.c index afbc975b8f..0bcde20c92 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -158,8 +158,9 @@ int qdev_init(DeviceState *dev) static int unattached_count = 0; gchar *name = g_strdup_printf("device[%d]", unattached_count++); - object_property_add_child(container_get("/machine/unattached"), name, - OBJECT(dev), NULL); + object_property_add_child(container_get(qdev_get_machine(), + "/unattached"), + name, OBJECT(dev), NULL); g_free(name); } @@ -677,7 +678,7 @@ Object *qdev_get_machine(void) static Object *dev; if (dev == NULL) { - dev = container_get("/machine"); + dev = container_get(object_get_root(), "/machine"); } return dev; |