| Message ID | 20170126153837.25597-1-stefanha@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 26.01.2017 16:38, Stefan Hajnoczi wrote: > This hunk should not have been merged but I forgot to remove it. Let's > remove it before it slips into a QEMU release. Too late - looks like this patch has never been committed :-( > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > --- > aio-posix.c | 7 ------- > 1 file changed, 7 deletions(-) > > diff --git a/aio-posix.c b/aio-posix.c > index 9453d83..9a6348b 100644 > --- a/aio-posix.c > +++ b/aio-posix.c > @@ -723,13 +723,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); > Could we get this at least added for QEMU 2.11 ? Reviewed-by: Thomas Huth <thuth@redhat.com>
On Thu, Nov 02, 2017 at 07:31:13AM +0100, Thomas Huth wrote: > On 26.01.2017 16:38, Stefan Hajnoczi wrote: > > This hunk should not have been merged but I forgot to remove it. Let's > > remove it before it slips into a QEMU release. > > Too late - looks like this patch has never been committed :-( > > > > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > > --- > > aio-posix.c | 7 ------- > > 1 file changed, 7 deletions(-) > > > > diff --git a/aio-posix.c b/aio-posix.c > > index 9453d83..9a6348b 100644 > > --- a/aio-posix.c > > +++ b/aio-posix.c > > @@ -723,13 +723,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); > > > > Could we get this at least added for QEMU 2.11 ? > > Reviewed-by: Thomas Huth <thuth@redhat.com> I am sending a new version of this patch (it needs to be rebased). Stefan
diff --git a/aio-posix.c b/aio-posix.c index 9453d83..9a6348b 100644 --- a/aio-posix.c +++ b/aio-posix.c @@ -723,13 +723,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);
This hunk should not have been merged but I forgot to remove it. Let's remove it before it slips into a QEMU release. ¯\_(ツ)_/¯ Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> --- aio-posix.c | 7 ------- 1 file changed, 7 deletions(-)