diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-02-20 12:04:02 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-02-20 12:10:23 +0000 |
| commit | 4c0c9bbe78901a706497a8fa1a27935bafc20cf7 (patch) | |
| tree | 43fe900e8e748606dcdb0ef22d10068cc4608aaa /hw/isa/pc87312.c | |
| parent | 46eef33b89e936ca793e13c4aeea1414e97e8dbb (diff) | |
| parent | 1094fd3a6219923c8d1abfc7dee5af996a181e7a (diff) | |
| download | hqemu-4c0c9bbe78901a706497a8fa1a27935bafc20cf7.zip hqemu-4c0c9bbe78901a706497a8fa1a27935bafc20cf7.tar.gz | |
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>
Diffstat (limited to 'hw/isa/pc87312.c')
0 files changed, 0 insertions, 0 deletions
