Skip to content
  • Anthony Liguori's avatar
    Merge remote-tracking branch 'kwolf/for-anthony' into staging · 90c45b30
    Anthony Liguori authored
    
    
    * 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: default avatarAnthony Liguori <aliguori@us.ibm.com>
    90c45b30