Merge branch 'upstream-merge'

Merge branch 'upstream-merge'

* upstream-merge: (154 commits)
  Move macros GCC_ATTR and GCC_FMT_ATTR to common header file
  Fix OpenBSD build
  block-verify: fix 32-bit build
  Fix compilation error (missing include statement)
  mips_malta: Fix format strings
  mips_fulong2e: Fix format strings
  trace: Fix user emulator dependency on trace objects
  blkverify: Add block driver for verifying I/O
  scsi_bus: fix length and xfer_mode for RESERVE and RELEASE commands
  scsi-generic: add missing reset handler
  qcow2: Avoid bounce buffers for AIO write requests
  qcow2: Avoid bounce buffers for AIO read requests
  cutils: qemu_iovec_copy and qemu_iovec_memset
  ide: propagate the required alignment
  scsi-disk: propagate the required alignment
  virtio-blk: propagate the required alignment
  qcow2: Get rid of additional sync on COW
  qcow2: Move sync out of qcow2_alloc_clusters
  qcow2: Move sync out of update_refcount
  qcow2: Move sync out of write_refcount_block_entries
  ...

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>