Commit 718d7f4f authored by Peter Maydell's avatar Peter Maydell
Browse files

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



# gpg: Signature made Mon 17 Jul 2017 16:40:18 BST
# gpg:                using RSA key 0x9CA4ABB381AB73C8
# 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: fix shadowed variable in bdrv_co_pdiscard
  util/aio-win32: Only select on what we are actually waiting for

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ed645872 593ed6f0

block/io.c

+0 −1
Original line number Diff line number Diff line
@@ -2359,7 +2359,6 @@ int coroutine_fn bdrv_co_pdiscard(BlockDriverState *bs, int64_t offset, 
    assert(max_pdiscard >= bs->bl.request_alignment);



    while (bytes > 0) {

        int ret;

        int num = bytes;



        if (head) {

util/aio-win32.c

+10 −3
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ void aio_set_fd_handler(AioContext *ctx, 
        }

    } else {

        HANDLE event;

        long bitmask = 0;



        if (node == NULL) {

            /* Alloc and insert if it's not already there */
@@ -95,10 +96,16 @@ void aio_set_fd_handler(AioContext *ctx, 
        node->io_write = io_write;

        node->is_external = is_external;



        if (io_read) {

            bitmask |= FD_READ | FD_ACCEPT | FD_CLOSE;

        }



        if (io_write) {

            bitmask |= FD_WRITE | FD_CONNECT;

        }



        event = event_notifier_get_handle(&ctx->notifier);

        WSAEventSelect(node->pfd.fd, event,

                       FD_READ | FD_ACCEPT | FD_CLOSE |

                       FD_CONNECT | FD_WRITE | FD_OOB);

        WSAEventSelect(node->pfd.fd, event, bitmask);

    }



    qemu_lockcnt_unlock(&ctx->list_lock);