Commit 144a6db0 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging 



# gpg: Signature made Thu 11 Aug 2016 11:35:33 BST
# 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:
  linux-aio: Handle io_submit() failure gracefully

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents d08306dc 44713c9e

block/linux-aio.c

+7 −1
Original line number Diff line number Diff line
@@ -221,7 +221,13 @@ static void ioq_submit(LinuxAioState *s) 
            break;

        }

        if (ret < 0) {

            abort();

            /* Fail the first request, retry the rest */

            aiocb = QSIMPLEQ_FIRST(&s->io_q.pending);

            QSIMPLEQ_REMOVE_HEAD(&s->io_q.pending, next);

            s->io_q.in_queue--;

            aiocb->ret = ret;

            qemu_laio_process_completion(aiocb);

            continue;

        }



        s->io_q.in_flight += ret;