openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pull request 

Regression fix for host block devices with the file-posix driver when aio=native is in use.
 -----BEGIN PGP SIGNATURE-----
 
 iQEcBAABAgAGBQJbVzY5AAoJEJykq7OBq3PIzrMIAJ4EOK0LjhGzNYZ+JcdbE0jD
 YFEam28cx/oElnf8sFE/cGL+BwI4/OnNjtfef77vkdOUWWxHYUaT6rt8HUycOX+X
 3DXUpJx3B6e7XePBsXzIelfXu8+qoVXbx00h4EpR/eBpv1/lEGU5Qu0cHKTJCiwI
 uIogBxUnR8kPWhhOoxx9vPPMgNJ3ErN//g7b9DJxXUTXoji81YyFKZX/4qlw7I51
 1rRTvZNqEpeX3qqCwxaY3IGaz2RM0AxTzGZEk3GnKjPtnu2yhE8ix0GpnURZgEmW
 IuMUpC8WrZttkoUyMS80XrmC/6GSft8626WUHinqFMzTS4+mVUXbIR1X3IIMr3Y=
 =4m1S
 -----END PGP SIGNATURE-----

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: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2018-07-24 15:26:01 +01:00
parent 0a7052bb75 042b757cc7
commit 3bae150448
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
block/file-posix.c
View File

@ -3158,6 +3158,7 @@ static BlockDriver bdrv_host_device = {
.bdrv_refresh_limits = raw_refresh_limits, .bdrv_refresh_limits = raw_refresh_limits,
.bdrv_io_plug = raw_aio_plug, .bdrv_io_plug = raw_aio_plug,
.bdrv_io_unplug = raw_aio_unplug, .bdrv_io_unplug = raw_aio_unplug,
.bdrv_attach_aio_context = raw_aio_attach_aio_context,
.bdrv_co_truncate = raw_co_truncate, .bdrv_co_truncate = raw_co_truncate,
.bdrv_getlength = raw_getlength, .bdrv_getlength = raw_getlength,
@ -3280,6 +3281,7 @@ static BlockDriver bdrv_host_cdrom = {
.bdrv_refresh_limits = raw_refresh_limits, .bdrv_refresh_limits = raw_refresh_limits,
.bdrv_io_plug = raw_aio_plug, .bdrv_io_plug = raw_aio_plug,
.bdrv_io_unplug = raw_aio_unplug, .bdrv_io_unplug = raw_aio_unplug,
.bdrv_attach_aio_context = raw_aio_attach_aio_context,
.bdrv_co_truncate = raw_co_truncate, .bdrv_co_truncate = raw_co_truncate,
.bdrv_getlength = raw_getlength, .bdrv_getlength = raw_getlength,
@ -3410,6 +3412,7 @@ static BlockDriver bdrv_host_cdrom = {
.bdrv_refresh_limits = raw_refresh_limits, .bdrv_refresh_limits = raw_refresh_limits,
.bdrv_io_plug = raw_aio_plug, .bdrv_io_plug = raw_aio_plug,
.bdrv_io_unplug = raw_aio_unplug, .bdrv_io_unplug = raw_aio_unplug,
.bdrv_attach_aio_context = raw_aio_attach_aio_context,
.bdrv_co_truncate = raw_co_truncate, .bdrv_co_truncate = raw_co_truncate,
.bdrv_getlength = raw_getlength, .bdrv_getlength = raw_getlength,