From ef9115dd7c82a196b18cac46784724bdebf01fbc Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Fri, 3 Nov 2017 15:40:41 +0000 Subject: [PATCH] aio-posix: drop QEMU_AIO_POLL_MAX_NS env var MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This hunk should not have been merged but I forgot to remove it. Let's remove it before it slips into a QEMU release. ¯\_(ツ)_/¯ Reviewed-by: Thomas Huth Signed-off-by: Stefan Hajnoczi Message-id: 20171103154041.12617-1-stefanha@redhat.com Signed-off-by: Stefan Hajnoczi --- util/aio-posix.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/util/aio-posix.c b/util/aio-posix.c index 5946ac09f0..1427f49b4a 100644 --- a/util/aio-posix.c +++ b/util/aio-posix.c @@ -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); -- 2.11.4.GIT