Commit 3bae1504 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging 



Pull request

Regression fix for host block devices with the file-posix driver when aio=native is in use.

# gpg: Signature made Tue 24 Jul 2018 15:22:49 BST
# gpg:                using RSA key 9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  block/file-posix: add bdrv_attach_aio_context callback for host dev and cdrom

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 0a7052bb 042b757c

block/file-posix.c

+3 −0
Original line number Diff line number Diff line
@@ -3158,6 +3158,7 @@ static BlockDriver bdrv_host_device = { 
    .bdrv_refresh_limits = raw_refresh_limits,

    .bdrv_io_plug = raw_aio_plug,

    .bdrv_io_unplug = raw_aio_unplug,

    .bdrv_attach_aio_context = raw_aio_attach_aio_context,



    .bdrv_co_truncate       = raw_co_truncate,

    .bdrv_getlength	= raw_getlength,
@@ -3280,6 +3281,7 @@ static BlockDriver bdrv_host_cdrom = { 
    .bdrv_refresh_limits = raw_refresh_limits,

    .bdrv_io_plug = raw_aio_plug,

    .bdrv_io_unplug = raw_aio_unplug,

    .bdrv_attach_aio_context = raw_aio_attach_aio_context,



    .bdrv_co_truncate    = raw_co_truncate,

    .bdrv_getlength      = raw_getlength,
@@ -3410,6 +3412,7 @@ static BlockDriver bdrv_host_cdrom = { 
    .bdrv_refresh_limits = raw_refresh_limits,

    .bdrv_io_plug = raw_aio_plug,

    .bdrv_io_unplug = raw_aio_unplug,

    .bdrv_attach_aio_context = raw_aio_attach_aio_context,



    .bdrv_co_truncate    = raw_co_truncate,

    .bdrv_getlength      = raw_getlength,