mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-----BEGIN PGP SIGNATURE-----

Browse Source 
iQEcBAABAgAGBQJaAEVyAAoJEJykq7OBq3PI9ZEIAIkcTGr7O4iAKIZTvT/HA8i4
 QO2GHs/WvojDgLEqqqqOEVH+1HrcsCx0UneXQqwKe665jnOaRN2e+m/p51xnWi9B
 kM1a1HumK/L7LvIk5FJReL8JjHQuYkW40q5NQ7mgHf535Ur2QxmLlMtx9qYCR6vF
 WMPqNGjqnD3m42/oxMN9lL+cM1fDY0WnZEEGIj9UdDqI7dbBjUIyhE6f44+xgDgl
 EdYx9kdEMgVLxeLilPe8wZE2Aw0FtpXbEFJMOEbeoDhdKzO2UU/3CGPe1MdIXRzN
 72ITxMrBZcWT+jPvSmuSkcU+LsfPoTJEZ27TO5ARoGKjuvgQiEOete/hDXoSpOI=
 =xgU+
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2017-11-06 11:24:14 +00:00
commit d24aaf2a29
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
util/aio-posix.c
View File

@ -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);