diff options
| author | Peter Maydell | 2017-11-06 12:24:14 +0100 |
|---|---|---|
| committer | Peter Maydell | 2017-11-06 12:24:14 +0100 |
| commit | d24aaf2a2915424962fb101142f28fa4307f4740 (patch) | |
| tree | 5b6c8cb938e0f086cc61df6d97ce7a744c4b660f | |
| parent | Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (diff) | |
| parent | aio-posix: drop QEMU_AIO_POLL_MAX_NS env var (diff) | |
| download | qemu-d24aaf2a2915424962fb101142f28fa4307f4740.tar.gz qemu-d24aaf2a2915424962fb101142f28fa4307f4740.tar.xz qemu-d24aaf2a2915424962fb101142f28fa4307f4740.zip | |
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: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | util/aio-posix.c | 7 |
1 files changed, 0 insertions, 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); |