[Qemu-commits] [qemu/qemu] 147dfa: aio-posix: Change CONFIG_EPOLL to CONFIG_EPOLL_CRE...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 147dfab747dd1720cb6350b6b746ca84e15f9a24
      
https://github.com/qemu/qemu/commit/147dfab747dd1720cb6350b6b746ca84e15f9a24
  Author: Matthew Fortune <address@hidden>
  Date:   2016-03-17 (Thu, 17 Mar 2016)

  Changed paths:
    M aio-posix.c

  Log Message:
  -----------
  aio-posix: Change CONFIG_EPOLL to CONFIG_EPOLL_CREATE1

CONFIG_EPOLL was being used to guard epoll_create1 which results
in build failures on CentOS 5.

Signed-off-by: Matthew Fortune <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 1f3ddfcb258e6e0562467a9644daad3f28597da8
      
https://github.com/qemu/qemu/commit/1f3ddfcb258e6e0562467a9644daad3f28597da8
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2016-03-17 (Thu, 17 Mar 2016)

  Changed paths:
    M block/qed.c

  Log Message:
  -----------
  Revert "qed: Implement .bdrv_drain"

This reverts commit df9a681dc9ad41c9cdeb9ecc5d060ba9abd27e01.

Note that commit df9a681dc9ad41c9cdeb9ecc5d060ba9abd27e01 included some
unrelated hunks, possibly due to a merge failure or an overlooked
squash.  This only reverts the qed .bdrv_drain() implementation.

The qed .bdrv_drain() implementation is unsafe and can lead to a double
request completion.

Paolo Bonzini reports:
"The problem is that bdrv_qed_drain calls qed_plug_allocating_write_reqs
unconditionally, but this is not correct if an allocating write is
queued.  In this case, qed_unplug_allocating_write_reqs will restart the
allocating write and possibly cause it to complete.  The aiocb however
is still in use for the L2/L1 table writes, and will then be completed
again as soon as the table writes are stable."

For QEMU 2.6 we can simply revert this commit.  A full solution for the
qed need check timer may be added if the bdrv_drain() implementation is
extended.

Reported-by: Paolo Bonzini <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden


  Commit: 331ac65963ab74dd84659b748affa0b111486f06
      
https://github.com/qemu/qemu/commit/331ac65963ab74dd84659b748affa0b111486f06
  Author: Peter Maydell <address@hidden>
  Date:   2016-03-17 (Thu, 17 Mar 2016)

  Changed paths:
    M aio-posix.c
    M block/qed.c

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

# gpg: Signature made Thu 17 Mar 2016 11:08:28 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <address@hidden>"
# gpg:                 aka "Stefan Hajnoczi <address@hidden>"

* remotes/stefanha/tags/block-pull-request:
  Revert "qed: Implement .bdrv_drain"
  aio-posix: Change CONFIG_EPOLL to CONFIG_EPOLL_CREATE1

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/8c4575472494...331ac65963ab