Revision 4c0c9bbe
ID | 4c0c9bbe78901a706497a8fa1a27935bafc20cf7 |
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging
- remotes/qmp-unstable/queue/qmp:
monitor: Add object_add class argument completion.
monitor: Add object_del id argument completion.
monitor: Add device_add device argument completion.
monitor: Add device_del id argument completion.
qmp: expose list of supported character device backends
Use error_is_set() only when necessary
QMP: allow JSON dict arguments in qmp-shell
hmp: migrate command (without -d) now blocks correctly
Conflicts:
blockdev.c
[PMM: resolved trivial conflict in blockdev.c]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Files
- added
- modified
- copied
- renamed
- deleted