diff options
| author | Peter Maydell | 2019-01-15 18:24:00 +0100 |
|---|---|---|
| committer | Peter Maydell | 2019-01-15 18:24:00 +0100 |
| commit | 4b9f0b0f7c84eea2dfb0d5be3e0254bc91319dbc (patch) | |
| tree | 6dad0111547ebebcd2bb5e5ac412ba2b4f052883 /qom/object.c | |
| parent | Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2019-01-14' into st... (diff) | |
| parent | aio-posix: Fix concurrent aio_poll/set_fd_handler. (diff) | |
| download | qemu-4b9f0b0f7c84eea2dfb0d5be3e0254bc91319dbc.tar.gz qemu-4b9f0b0f7c84eea2dfb0d5be3e0254bc91319dbc.tar.xz qemu-4b9f0b0f7c84eea2dfb0d5be3e0254bc91319dbc.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
Pull request
No user-visible changes.
# gpg: Signature made Mon 14 Jan 2019 16:32:19 GMT
# 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:
aio-posix: Fix concurrent aio_poll/set_fd_handler.
aio-posix: Unregister fd from ctx epoll when removing fd_handler.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qom/object.c')
0 files changed, 0 insertions, 0 deletions