Commit d24aaf2a 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 06 Nov 2017 11:20:18 GMT
# 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:
  aio-posix: drop QEMU_AIO_POLL_MAX_NS env var

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

util/aio-posix.c

+0 −7
Original line number Diff line number Diff line
@@ -701,13 +701,6 @@ bool aio_poll(AioContext *ctx, bool blocking) 


void aio_context_setup(AioContext *ctx)

{

    /* TODO remove this in final patch submission */

    if (getenv("QEMU_AIO_POLL_MAX_NS")) {

        fprintf(stderr, "The QEMU_AIO_POLL_MAX_NS environment variable has "

                "been replaced with -object iothread,poll-max-ns=NUM\n");

        exit(1);

    }



#ifdef CONFIG_EPOLL_CREATE1

    assert(!ctx->epollfd);

    ctx->epollfd = epoll_create1(EPOLL_CLOEXEC);