mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

monitor: convert do_device_add() to QObject

Browse Source
This commit is contained in:
Markus Armbruster 2010-02-10 20:52:01 +01:00
parent c7e4e8ceb3
commit 8bc27249f0
3 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
hw/qdev.c
View File

@ -586,7 +586,9 @@ static BusState *qbus_find(const char *path)
dev = qbus_find_dev(bus, elem);
if (!dev) {
qerror_report(QERR_DEVICE_NOT_FOUND, elem);
qbus_list_dev(bus);
if (!monitor_cur_is_qmp()) {
qbus_list_dev(bus);
}
return NULL;
}
@ -605,7 +607,9 @@ static BusState *qbus_find(const char *path)
return QLIST_FIRST(&dev->child_bus);
default:
qerror_report(QERR_DEVICE_MULTIPLE_BUSSES, elem);
qbus_list_bus(dev);
if (!monitor_cur_is_qmp()) {
qbus_list_bus(dev);
}
return NULL;
}
}
@ -619,7 +623,9 @@ static BusState *qbus_find(const char *path)
bus = qbus_find_bus(dev, elem);
if (!bus) {
qerror_report(QERR_BUS_NOT_FOUND, elem);
qbus_list_bus(dev);
if (!monitor_cur_is_qmp()) {
qbus_list_bus(dev);
}
return NULL;
}
}
@ -762,16 +768,36 @@ void do_info_qdm(Monitor *mon)
}
}
void do_device_add(Monitor *mon, const QDict *qdict)
/**
* do_device_add(): Add a device
*
* Argument qdict contains
* - "driver": the name of the new device's driver
* - "bus": the device's parent bus (device tree path)
* - "id": the device's ID (must be unique)
* - device properties
*
* Example:
*
* { "driver": "usb-net", "id": "eth1", "netdev": "netdev1" }
*/
int do_device_add(Monitor *mon, const QDict *qdict, QObject **ret_data)
{
QemuOpts *opts;
opts = qemu_opts_from_qdict(&qemu_device_opts, qdict);
if (opts) {
if (qdev_device_help(opts) || qdev_device_add(opts) == NULL) {
qemu_opts_del(opts);
}
if (!opts) {
return -1;
}
if (!monitor_cur_is_qmp() && qdev_device_help(opts)) {
qemu_opts_del(opts);
return 0;
}
if (!qdev_device_add(opts)) {
qemu_opts_del(opts);
return -1;
}
return 0;
}
void do_device_del(Monitor *mon, const QDict *qdict)

2
hw/qdev.h
View File

@ -175,7 +175,7 @@ void qbus_free(BusState *bus);
void do_info_qtree(Monitor *mon);
void do_info_qdm(Monitor *mon);
void do_device_add(Monitor *mon, const QDict *qdict);
int do_device_add(Monitor *mon, const QDict *qdict, QObject **ret_data);
void do_device_del(Monitor *mon, const QDict *qdict);
/*** qdev-properties.c ***/

3
qemu-monitor.hx
View File

@ -573,7 +573,8 @@ ETEXI
.args_type = "device:O",
.params = "driver[,prop=value][,...]",
.help = "add device, like -device on the command line",
.mhandler.cmd = do_device_add,
.user_print = monitor_user_noop,
.mhandler.cmd_new = do_device_add,
},
STEXI