Merge remote-tracking branch 'kwolf/for-anthony' into staging

* kwolf/for-anthony: (46 commits)
  qed: remove incoming live migration blocker
  qed: honor BDRV_O_INCOMING for incoming live migration
  migration: clear BDRV_O_INCOMING flags on end of incoming live migration
  qed: add bdrv_invalidate_cache to be called after incoming live migration
  blockdev: open images with BDRV_O_INCOMING on incoming live migration
  block: add a function to clear incoming live migration flags
  block: Add new BDRV_O_INCOMING flag to notice incoming live migration
  block stream: close unused files and update ->backing_hd
  qemu-iotests: Fix call syntax for qemu-io
  qemu-iotests: Fix call syntax for qemu-img
  qemu-iotests: Test unknown qcow2 header extensions
  qemu-iotests: qcow2.py
  sheepdog: fix send req helpers
  sheepdog: implement SD_OP_FLUSH_VDI operation
  block: bdrv_append() fixes
  qed: track dirty flag status
  qemu-img: add dirty flag status
  qed: image fragmentation statistics
  qemu-img: add image fragmentation statistics
  block: document job API
  ...

diff --combined dma.h
index 5bd1fc836fe52e4806ae371f3707c5ea2c80800b,05ac325e27cd6bdd414ab0ccf8e0836e3adc73a0..8c1ec8f0d205750b928911e885a72ce17f522600
--- 1/dma.h
--- 2/dma.h
+++ b/dma.h
@@@ -11,11 -11,17 +11,16 @@@
  #define DMA_H
  
  #include <stdio.h>
 -//#include "cpu.h"
  #include "hw/hw.h"
  #include "block.h"
  
  typedef struct ScatterGatherEntry ScatterGatherEntry;
  
+ typedef enum {
+     DMA_DIRECTION_TO_DEVICE = 0,
+     DMA_DIRECTION_FROM_DEVICE = 1,
+ } DMADirection;
+ 
  struct QEMUSGList {
      ScatterGatherEntry *sg;
      int nsg;
@@@ -28,11 -34,6 +33,6 @@@ typedef target_phys_addr_t dma_addr_t
  
  #define DMA_ADDR_FMT TARGET_FMT_plx
  
- typedef enum {
-     DMA_DIRECTION_TO_DEVICE = 0,
-     DMA_DIRECTION_FROM_DEVICE = 1,
- } DMADirection;
- 
  struct ScatterGatherEntry {
      dma_addr_t base;
      dma_addr_t len;
@@@ -50,7 -51,7 +50,7 @@@ typedef BlockDriverAIOCB *DMAIOFunc(Blo
  BlockDriverAIOCB *dma_bdrv_io(BlockDriverState *bs,
                                QEMUSGList *sg, uint64_t sector_num,
                                DMAIOFunc *io_func, BlockDriverCompletionFunc *cb,
-                               void *opaque, bool to_dev);
+                               void *opaque, DMADirection dir);
  BlockDriverAIOCB *dma_bdrv_read(BlockDriverState *bs,
                                  QEMUSGList *sg, uint64_t sector,
                                  BlockDriverCompletionFunc *cb, void *opaque);