diff options
Diffstat (limited to 'hw/qdev-monitor.c')
| -rw-r--r-- | hw/qdev-monitor.c | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c index a310cc7b16..81d654827f 100644 --- a/hw/qdev-monitor.c +++ b/hw/qdev-monitor.c @@ -19,6 +19,7 @@ #include "qdev.h" #include "monitor.h" +#include "qmp-commands.h" /* * Aliases were a bad idea from the start. Let's keep them @@ -180,9 +181,7 @@ static Object *qdev_get_peripheral(void) static Object *dev; if (dev == NULL) { - dev = object_new("container"); - object_property_add_child(object_get_root(), "peripheral", - OBJECT(dev), NULL); + dev = container_get("/machine/peripheral"); } return dev; @@ -193,9 +192,7 @@ static Object *qdev_get_peripheral_anon(void) static Object *dev; if (dev == NULL) { - dev = object_new("container"); - object_property_add_child(object_get_root(), "peripheral-anon", - OBJECT(dev), NULL); + dev = container_get("/machine/peripheral-anon"); } return dev; @@ -462,10 +459,6 @@ DeviceState *qdev_device_add(QemuOpts *opts) qdev_free(qdev); return NULL; } - if (qdev_init(qdev) < 0) { - qerror_report(QERR_DEVICE_INIT_FAILED, driver); - return NULL; - } if (qdev->id) { object_property_add_child(qdev_get_peripheral(), qdev->id, OBJECT(qdev), NULL); @@ -476,6 +469,10 @@ DeviceState *qdev_device_add(QemuOpts *opts) OBJECT(qdev), NULL); g_free(name); } + if (qdev_init(qdev) < 0) { + qerror_report(QERR_DEVICE_INIT_FAILED, driver); + return NULL; + } qdev->opts = opts; return qdev; } @@ -574,17 +571,17 @@ int do_device_add(Monitor *mon, const QDict *qdict, QObject **ret_data) return 0; } -int do_device_del(Monitor *mon, const QDict *qdict, QObject **ret_data) +void qmp_device_del(const char *id, Error **errp) { - const char *id = qdict_get_str(qdict, "id"); DeviceState *dev; dev = qdev_find_recursive(sysbus_get_default(), id); if (NULL == dev) { - qerror_report(QERR_DEVICE_NOT_FOUND, id); - return -1; + error_set(errp, QERR_DEVICE_NOT_FOUND, id); + return; } - return qdev_unplug(dev); + + qdev_unplug(dev, errp); } void qdev_machine_init(void) |