[Qemu-devel] [PULL 0/1] Block patches

[Qemu-devel] [PULL 0/1] Block patches

[Stefan Hajnoczi]

The following changes since commit b33afc415622e5eb26e0f14fd27eb86e32a5472e:

  Merge remote-tracking branch 'remotes/stsquad/tags/pull-ci-updates-for-softfreeze-021117-2' into staging (2017-11-03 10:08:34 +0000)

are available in the git repository at:

  git://github.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to ef9115dd7c82a196b18cac46784724bdebf01fbc:

  aio-posix: drop QEMU_AIO_POLL_MAX_NS env var (2017-11-06 11:04:38 +0000)

----------------------------------------------------------------

----------------------------------------------------------------

Stefan Hajnoczi (1):
  aio-posix: drop QEMU_AIO_POLL_MAX_NS env var

 util/aio-posix.c | 7 -------
 1 file changed, 7 deletions(-)

-- 
2.13.6

[Qemu-devel] [PULL 1/1] aio-posix: drop QEMU_AIO_POLL_MAX_NS env var

[Stefan Hajnoczi]

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>
---
 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.13.6

Re: [Qemu-devel] [PULL 0/1] Block patches

[Peter Maydell]

On 6 November 2017 at 11:20, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit b33afc415622e5eb26e0f14fd27eb86e32a5472e:
>
>   Merge remote-tracking branch 'remotes/stsquad/tags/pull-ci-updates-for-softfreeze-021117-2' into staging (2017-11-03 10:08:34 +0000)
>
> are available in the git repository at:
>
>   git://github.com/stefanha/qemu.git tags/block-pull-request
>
> for you to fetch changes up to ef9115dd7c82a196b18cac46784724bdebf01fbc:
>
>   aio-posix: drop QEMU_AIO_POLL_MAX_NS env var (2017-11-06 11:04:38 +0000)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM