OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qdev: device_del: Search for to be unplugged device in 'peripheral' container

Browse Source 
device_add puts every device with 'id' inside of 'peripheral'
container using id's value as the last component name.
Use it by replacing recursive search on sysbus with path
lookup in 'peripheral' container, which could handle both
BUS and BUS-less device cases.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Igor Mammedov 2014-10-02 10:08:45 +00:00 committed by Andreas Färber
parent 7716b8ca74
commit b6cc36abb2
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qdev-monitor.c
View File

@ -686,15 +686,20 @@ int do_device_add(Monitor *mon, const QDict *qdict, QObject **ret_data)
void qmp_device_del(const char *id, Error **errp) void qmp_device_del(const char *id, Error **errp)
{ {
DeviceState *dev; Object *obj;
char *root_path = object_get_canonical_path(qdev_get_peripheral());
char *path = g_strdup_printf("%s/%s", root_path, id);
dev = qdev_find_recursive(sysbus_get_default(), id); g_free(root_path);
if (!dev) { obj = object_resolve_path_type(path, TYPE_DEVICE, NULL);
g_free(path);
if (!obj) {
error_set(errp, QERR_DEVICE_NOT_FOUND, id); error_set(errp, QERR_DEVICE_NOT_FOUND, id);
return; return;
} }
qdev_unplug(dev, errp); qdev_unplug(DEVICE(obj), errp);
} }
void qdev_machine_init(void) void qdev_machine_init(void)