From: Stefan Hajnoczi <stefanha@redhat.com>
Date: Fri, 3 Nov 2017 15:40:41 +0000 (+0000)
Subject: aio-posix: drop QEMU_AIO_POLL_MAX_NS env var
X-Git-Tag: v2.11.0-rc0~7^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef9115dd7c82a196b18cac46784724bdebf01fbc;p=thirdparty%2Fqemu.git

aio-posix: drop QEMU_AIO_POLL_MAX_NS env var

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 <thuth@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20171103154041.12617-1-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---

diff --git a/util/aio-posix.c b/util/aio-posix.c
index 5946ac09f05..1427f49b4a9 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);