]> git.proxmox.com Git - qemu.git/commit
Merge remote-tracking branch 'kwolf/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 29 Oct 2012 15:34:05 +0000 (10:34 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 29 Oct 2012 15:34:05 +0000 (10:34 -0500)
commit90c45b30319dee7d4137f18817395454728ea2f9
tree7d54515aa0b4a83f930a47f7b583852645e2e717
parentd262cb02861dd33375c08fc798930653b14769e9
parent3b6eda2f57a5b7ed047077b6272c2b5a9e3531ca
Merge remote-tracking branch 'kwolf/for-anthony' into staging

* kwolf/for-anthony: (32 commits)
  osdep: Less restrictive F_SEFL in qemu_dup_flags()
  qemu-iotests: add testcases for mirroring on-source-error/on-target-error
  qmp: add pull_event function
  mirror: add support for on-source-error/on-target-error
  iostatus: forward block_job_iostatus_reset to block job
  qemu-iotests: add mirroring test case
  mirror: implement completion
  qmp: add drive-mirror command
  mirror: introduce mirror job
  block: introduce BLOCK_JOB_READY event
  block: add block-job-complete
  block: rename block_job_complete to block_job_completed
  block: export dirty bitmap information in query-block
  block: introduce new dirty bitmap functionality
  block: add bdrv_open_backing_file
  block: add bdrv_query_stats
  block: add bdrv_query_info
  qemu-config: Add new -add-fd command line option
  monitor: Prevent removing fd from set during init
  monitor: Enable adding an inherited fd to an fd set
  ...

Conflicts:
vl.c

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
block.c
block.h
block_int.h
hmp.c
qapi-schema.json
qemu-config.c
qerror.h
qmp-commands.hx
vl.c