From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 6 Mar 2018 11:20:44 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
X-Git-Tag: for-upstream.depriv-2~157
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=58e2e17dba49b43f4ac9de19468aeae1c787dcc2;p=people%2Fiwj%2Fqemu.git

Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

Block layer patches

# gpg: Signature made Mon 05 Mar 2018 17:45:51 GMT
# gpg:                using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream: (38 commits)
  block: Fix NULL dereference on empty drive error
  qcow2: Replace align_offset() with ROUND_UP()
  block/ssh: Add basic .bdrv_truncate()
  block/ssh: Make ssh_grow_file() blocking
  block/ssh: Pull ssh_grow_file() from ssh_create()
  qemu-img: Make resize error message more general
  qcow2: make qcow2_co_create2() a coroutine_fn
  block: rename .bdrv_create() to .bdrv_co_create_opts()
  Revert "IDE: Do not flush empty CDROM drives"
  block: test blk_aio_flush() with blk->root == NULL
  block: add BlockBackend->in_flight counter
  block: extract AIO_WAIT_WHILE() from BlockDriverState
  aio: rename aio_context_in_iothread() to in_aio_context_home_thread()
  docs: document how to use the l2-cache-entry-size parameter
  specs/qcow2: Fix documentation of the compressed cluster descriptor
  iotest 033: add misaligned write-zeroes test via truncate
  block: fix write with zero flag set and iovector provided
  block: Drop unused .bdrv_co_get_block_status()
  vvfat: Switch to .bdrv_co_block_status()
  vpc: Switch to .bdrv_co_block_status()
  ...

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

# Conflicts:
#	include/block/block.h
---

58e2e17dba49b43f4ac9de19468aeae1c787dcc2
diff --cc include/block/block.h
index fac401ba3e,4a80a2acd4..8b6db952a2
--- a/include/block/block.h
+++ b/include/block/block.h
@@@ -2,7 -2,8 +2,8 @@@
  #define BLOCK_H
  
  #include "block/aio.h"
 +#include "qapi/qapi-types-block-core.h"
+ #include "block/aio-wait.h"
 -#include "qapi-types.h"
  #include "qemu/iov.h"
  #include "qemu/coroutine.h"
  #include "block/accounting.h"