Peter Maydell 4c0c9bbe78 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>
2014-02-20 12:10:23 +00:00
..
2013-12-20 16:26:16 +01:00
2014-02-17 11:57:23 -05:00
2013-12-16 10:12:20 +01:00
2014-02-17 11:57:23 -05:00
2014-02-09 09:12:38 +01:00
2014-02-17 11:57:23 -05:00
2014-02-17 11:57:23 -05:00
2014-02-17 11:57:23 -05:00
2014-01-31 22:05:03 +01:00
2014-01-31 22:05:03 +01:00
2014-02-17 11:57:23 -05:00