motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-09 02:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

vl: use qmp_device_add() in qemu_create_cli_devices()

Browse source 
qemu_create_cli_devices() should use qmp_device_add() to match the
behavior of the QMP monitor. A comment explained that libvirt changes
implementing strict CLI syntax were needed.

Peter Krempa <pkrempa@redhat.com> has confirmed that modern libvirt uses
the same JSON for -device (CLI) and device_add (QMP). Go ahead and use
qmp_device_add().

Cc: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-ID: <20240827192751.948633-3-stefanha@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2024-08-27 15:27:51 -04:00 • committed by Kevin Wolf
parent be93fd5372
commit 11bf1d6aa0
1 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
system/vl.c
View file

@ -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);
/* qmp_device_add(opt->opts, &ret_data, &error_fatal);
* TODO Eventually we should call qmp_device_add() here to make sure it assert(ret_data == NULL); /* error_fatal aborts */
* 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));
loc_pop(&opt->loc); loc_pop(&opt->loc);
} }
rom_reset_order_override(); rom_reset_order_override();