|
@@ -2653,17 +2653,11 @@ static void qemu_create_cli_devices(void)
|
|
qemu_opts_foreach(qemu_find_opts("device"),
|
|
qemu_opts_foreach(qemu_find_opts("device"),
|
|
device_init_func, NULL, &error_fatal);
|
|
device_init_func, NULL, &error_fatal);
|
|
QTAILQ_FOREACH(opt, &device_opts, next) {
|
|
QTAILQ_FOREACH(opt, &device_opts, next) {
|
|
- DeviceState *dev;
|
|
|
|
|
|
+ QObject *ret_data = NULL;
|
|
|
|
+
|
|
loc_push_restore(&opt->loc);
|
|
loc_push_restore(&opt->loc);
|
|
- /*
|
|
|
|
- * TODO Eventually we should call qmp_device_add() here to make sure it
|
|
|
|
- * behaves the same, but QMP still has to accept incorrectly typed
|
|
|
|
- * options until libvirt is fixed and we want to be strict on the CLI
|
|
|
|
- * from the start, so call qdev_device_add_from_qdict() directly for
|
|
|
|
- * now.
|
|
|
|
- */
|
|
|
|
- dev = qdev_device_add_from_qdict(opt->opts, true, &error_fatal);
|
|
|
|
- object_unref(OBJECT(dev));
|
|
|
|
|
|
+ qmp_device_add(opt->opts, &ret_data, &error_fatal);
|
|
|
|
+ assert(ret_data == NULL); /* error_fatal aborts */
|
|
loc_pop(&opt->loc);
|
|
loc_pop(&opt->loc);
|
|
}
|
|
}
|
|
rom_reset_order_override();
|
|
rom_reset_order_override();
|