]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 11 Jun 2014 20:34:08 +0000 (21:34 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 11 Jun 2014 20:34:08 +0000 (21:34 +0100)
commit05fedeef835c3c889e5d2e44f8abb11dcfcadefc
tree8dbcf074dec8246cb542e68f6b84c7abf5176e50
parent706808585a49bfd266e00b1c7723b6e1b0f4ff35
parenta491af471bf8f1188b2665f54d109065d4591e45
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging

* remotes/qmp-unstable/queue/qmp:
  json-parser: drop superfluous assignment for token variable
  readline: Clear screen on form feed.
  monitor: Add delvm and loadvm argument completion
  monitor: Add host_net_remove arguments completion
  readline: Make completion strings always unique
  monitor: Add host_net_add device argument completion
  net: Export valid host network devices list
  monitor: Add migrate_set_capability completion
  monitor: Add watchdog_action argument completion
  monitor: Add ringbuf_write and ringbuf_read argument completion
  dump: simplify get_len_buf_out()
  dump: hoist lzo_init() from get_len_buf_out() to dump_init()
  dump: select header bitness based on ELF class, not ELF architecture
  dump: eliminate DumpState.page_size ("guest's page size")
  dump: eliminate DumpState.page_shift ("guest's page shift")
  dump: simplify write_start_flat_header()
  dump: fill in the flat header signature more pleasingly to the eye

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>