Commit 856bd2c2 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Pull request

# gpg: Signature made Fri 25 Oct 2019 20:18:23 BST
# gpg:                using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  yield_until_fd_readable: make it work with any AioContect
  virtio-blk: Add blk_drain() to virtio_blk_device_unrealize()

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ee70fc26 d154ef37

hw/block/virtio-blk.c

+1 −0
Original line number Diff line number Diff line
@@ -1207,6 +1207,7 @@ static void virtio_blk_device_unrealize(DeviceState *dev, Error **errp) 
    VirtIODevice *vdev = VIRTIO_DEVICE(dev);

    VirtIOBlock *s = VIRTIO_BLK(dev);



    blk_drain(s->blk);

    virtio_blk_data_plane_destroy(s->dataplane);

    s->dataplane = NULL;

    qemu_del_vm_change_state_handler(s->change);

util/qemu-coroutine-io.c

+5 −2
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ qemu_co_send_recv(int sockfd, void *buf, size_t bytes, bool do_send) 
}



typedef struct {

    AioContext *ctx;

    Coroutine *co;

    int fd;

} FDYieldUntilData;
@@ -74,7 +75,7 @@ typedef struct { 
static void fd_coroutine_enter(void *opaque)

{

    FDYieldUntilData *data = opaque;

    qemu_set_fd_handler(data->fd, NULL, NULL, NULL);

    aio_set_fd_handler(data->ctx, data->fd, false, NULL, NULL, NULL, NULL);

    qemu_coroutine_enter(data->co);

}
@@ -83,8 +84,10 @@ void coroutine_fn yield_until_fd_readable(int fd) 
    FDYieldUntilData data;



    assert(qemu_in_coroutine());

    data.ctx = qemu_get_current_aio_context();

    data.co = qemu_coroutine_self();

    data.fd = fd;

    qemu_set_fd_handler(fd, fd_coroutine_enter, NULL, &data);

    aio_set_fd_handler(

        data.ctx, fd, false, fd_coroutine_enter, NULL, NULL, &data);

    qemu_coroutine_yield();

}