tree ece331a0cbb247b6c9b71bb4fe6ed0808a2050aa
parent e2a58ff493a2e00db3e963c1839c5374500110f2
parent 11ba81c3cde0bc070cced6e8ef2835fab4fe90c8
author Peter Maydell <peter.maydell@linaro.org> 1559665362 +0100
committer Peter Maydell <peter.maydell@linaro.org> 1559665362 +0100
mergetag object 11ba81c3cde0bc070cced6e8ef2835fab4fe90c8
 type commit
 tag for-upstream
 tagger Kevin Wolf <kwolf@redhat.com> 1559661597 +0200
 
 Block layer patches:
 
 - block: AioContext management, part 2
 - Avoid recursive block_status call (i.e. lseek() calls) if possible
 - linux-aio: Drop unused BlockAIOCB submission method
 - nvme: add Get/Set Feature Timestamp support
 - Fix crash on commit job start with active I/O on base node
 - Fix crash in bdrv_drained_end
 - Fix integer overflow in qcow2 discard
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJc9owiAAoJEH8JsnLIjy/W0hwP/0mjZ7Z0qJWFP0uS49Cvo6aO
 H77xUDFh33kqLHouxdkxhMAqQxozMEIdd/mqRQgHD26elsxu3OX6GOXeJYEP3CDJ
 Nz774kIN0V9esUmuatVxZzdp2Ptu5iZRZ9gVzVN83Kd0wMCeIg886oVbX/tAD5Vd
 pf0g2BxFi+tP691DI6OSy5ysS80k08fAgMOFPlTywgBO/1YAE3SGnJSaRNVERJkK
 vTLrDHTZ3uT+iQhFGessBFgNk/lkaexQa7CCA2iEU9W7xyLkXmihJ1Ro2hl8Y/+k
 WCZawhu11nQNj3dlPIvdhaeB2i3PsNsiEHqKdyrrJLxV4/bLut3jpeJ2QYYe73vs
 aHu9QDfUhoq3TLmc9HQRX3XVQ4vaik4V+1p2Pjw9DtFSGNm4uEp3Z0kp+Qi8bHSs
 lkcrU28NnmC0uxiMvQt7Ju0R34g3QyTdlj3I6Od3qmq7Dei+T4kyhCmikPhEgEUM
 Nz1aU4w246lyo6j9ezF2hzLSFGY0Tx9VzFYEm6p/MG0cZdlsawOKTyhj91wv1Eon
 F8+JHJ+Rq9att4cZpBUAZgilM+I1gxxWbF/N3zbyLYnN842GjbC8uUy+i+dKo/1s
 J/JC4bPvJx3bLmeEyAaNCLDIKd9DhBU/vrQzOnDLlE2Y3TFMaG9upYJHjp9R0PNn
 uAU+St6pd7voYrtW2o7G
 =zdPa
 -----END PGP SIGNATURE-----

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

Block layer patches:

- block: AioContext management, part 2
- Avoid recursive block_status call (i.e. lseek() calls) if possible
- linux-aio: Drop unused BlockAIOCB submission method
- nvme: add Get/Set Feature Timestamp support
- Fix crash on commit job start with active I/O on base node
- Fix crash in bdrv_drained_end
- Fix integer overflow in qcow2 discard

# gpg: Signature made Tue 04 Jun 2019 16:20:02 BST
# gpg:                using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream: (29 commits)
  iotests: Fix duplicated diff output on failure
  iotests: test big qcow2 shrink
  block/io: bdrv_pdiscard: support int64_t bytes parameter
  block/qcow2-refcount: add trace-point to qcow2_process_discards
  block: Remove bdrv_set_aio_context()
  test-bdrv-drain: Use bdrv_try_set_aio_context()
  iotests: Attach new devices to node in non-default iothread
  virtio-scsi-test: Test attaching new overlay with iothreads
  block: Remove wrong bdrv_set_aio_context() calls
  blockdev: Use bdrv_try_set_aio_context() for monitor commands
  block: Move node without parents to main AioContext
  test-block-iothread: BlockBackend AioContext across root node change
  test-block-iothread: Test adding parent to iothread node
  block: Adjust AioContexts when attaching nodes
  scsi-disk: Use qdev_prop_drive_iothread
  block: Add qdev_prop_drive_iothread property type
  block: Add BlockBackend.ctx
  block: Add Error to blk_set_aio_context()
  nbd-server: Call blk_set_allow_aio_context_change()
  test-block-iothread: Check filter node in test_propagate_mirror
  ...

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