[Qemu-commits] [qemu/qemu] 4e90cc: spec/parallels: fix a mistake

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 4e90ccc28e53eb92ecbd0cdb67da454d783ea828
      
https://github.com/qemu/qemu/commit/4e90ccc28e53eb92ecbd0cdb67da454d783ea828
  Author: Vladimir Sementsov-Ogievskiy <address@hidden>
  Date:   2016-07-18 (Mon, 18 Jul 2016)

  Changed paths:
    M docs/specs/parallels.txt

  Log Message:
  -----------
  spec/parallels: fix a mistake

We have only one flag for now - Empty Image flag. The patch fixes unused
bits specification and marks bit 1 as usused.

Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Signed-off-by: Denis V. Lunev <address@hidden>
CC: Stefan Hajnoczi <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 0187f5c9cb172771ba85c66e3bf61f8cde6d6561
      
https://github.com/qemu/qemu/commit/0187f5c9cb172771ba85c66e3bf61f8cde6d6561
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-07-18 (Mon, 18 Jul 2016)

  Changed paths:
    M async.c
    M block/linux-aio.c
    R block/raw-aio.h
    M block/raw-posix.c
    M block/raw-win32.c
    M block/win32-aio.c
    M include/block/aio.h
    A include/block/raw-aio.h

  Log Message:
  -----------
  linux-aio: share one LinuxAioState within an AioContext

This has better performance because it executes fewer system calls
and does not use a bottom half per disk.

Originally proposed by Ming Lei.

[Changed #include "raw-aio.h" to "block/raw-aio.h" in win32-aio.c to fix
build error as reported by Peter Maydell <address@hidden>.
--Stefan]

Acked-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>

squash! linux-aio: share one LinuxAioState within an AioContext


  Commit: 6977d901c43f6c2fc811c4ca9bf45bf0af6bb689
      
https://github.com/qemu/qemu/commit/6977d901c43f6c2fc811c4ca9bf45bf0af6bb689
  Author: Cao jin <address@hidden>
  Date:   2016-07-18 (Mon, 18 Jul 2016)

  Changed paths:
    M async.c

  Log Message:
  -----------
  aio_ctx_check: follow CODING_STYLE

replace tab with spaces

Signed-off-by: Cao jin <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 5e1b34a3fa0a0fbf46628aab10cc49f6f855520e
      
https://github.com/qemu/qemu/commit/5e1b34a3fa0a0fbf46628aab10cc49f6f855520e
  Author: Roman Pen <address@hidden>
  Date:   2016-07-18 (Mon, 18 Jul 2016)

  Changed paths:
    M block/linux-aio.c

  Log Message:
  -----------
  linux-aio: prevent submitting more than MAX_EVENTS

Invoking io_setup(MAX_EVENTS) we ask kernel to create ring buffer for us
with specified number of events.  But kernel ring buffer allocation logic
is a bit tricky (ring buffer is page size aligned + some percpu allocation
are required) so eventually more than requested events number is allocated.

>From a userspace side we have to follow the convention and should not try
to io_submit() more or logic, which consumes completed events, should be
changed accordingly.  The pitfall is in the following sequence:

    MAX_EVENTS = 128
    io_setup(MAX_EVENTS)

    io_submit(MAX_EVENTS)
    io_submit(MAX_EVENTS)

    /* now 256 events are in-flight */

    io_getevents(MAX_EVENTS) = 128

    /* we can handle only 128 events at once, to be sure
     * that nothing is pended the io_getevents(MAX_EVENTS)
     * call must be invoked once more or hang will happen. */

To prevent the hang or reiteration of io_getevents() call this patch
restricts the number of in-flights, which is now limited to MAX_EVENTS.

Signed-off-by: Roman Pen <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden
Cc: Stefan Hajnoczi <address@hidden>
Cc: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 7e00346505feb94ee740d311621eb0bf4c14d6db
      
https://github.com/qemu/qemu/commit/7e00346505feb94ee740d311621eb0bf4c14d6db
  Author: Cao jin <address@hidden>
  Date:   2016-07-18 (Mon, 18 Jul 2016)

  Changed paths:
    M aio-posix.c
    M aio-win32.c
    M async.c
    M include/block/aio.h

  Log Message:
  -----------
  aio-posix: remove useless parameter

Parameter **errp of aio_context_setup() is useless, remove it
and clean up the related code.

Cc: Stefan Hajnoczi <address@hidden>
Cc: Fam Zheng <address@hidden>
Cc: Eric Blake <address@hidden>
Signed-off-by: Cao jin <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: f8dccbb63463d72dcf273b583d41810a01feab26
      
https://github.com/qemu/qemu/commit/f8dccbb63463d72dcf273b583d41810a01feab26
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2016-07-18 (Mon, 18 Jul 2016)

  Changed paths:
    M scripts/checkpatch.pl

  Log Message:
  -----------
  checkpatch: consider git extended headers valid patches

Renames look like this with git-diff(1) when diff.renames = true is set:

  diff --git a/a b/b
  similarity index 100%
  rename from a
  rename to b

This raises the "Does not appear to be a unified-diff format patch"
error because checkpatch.pl only considers a diff valid if it contains
at least one "@@" hunk.

This patch accepts renames and copies too so that checkpatch.pl exits
successfully when a diff only renames/copies files.  The git diff
extended header format is described on the git-diff(1) man page.

Reported-by: Colin Lord <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: ab3b9c1be8739f109596985588eb061b7f66c1d1
      
https://github.com/qemu/qemu/commit/ab3b9c1be8739f109596985588eb061b7f66c1d1
  Author: Cao jin <address@hidden>
  Date:   2016-07-18 (Mon, 18 Jul 2016)

  Changed paths:
    M hw/block/dataplane/virtio-blk.c

  Log Message:
  -----------
  virtio-blk: dataplane cleanup

No need duplicate the judgment, there is one in function entry.

Cc: Stefan Hajnoczi <address@hidden>
Cc: Kevin Wolf <address@hidden>
Cc: Max Reitz <address@hidden>
Signed-off-by: Cao jin <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: e1029ae26d96d5de78c2d9af5eddcea92e73a46a
      
https://github.com/qemu/qemu/commit/e1029ae26d96d5de78c2d9af5eddcea92e73a46a
  Author: Fam Zheng <address@hidden>
  Date:   2016-07-18 (Mon, 18 Jul 2016)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  MAINTAINERS: Add include/block/aio.h to block I/O path section

This file is actually the header for async.c and aio-*.c., so add it to
the same section.

Suggested-by: Max Reitz <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: a098fbc025095a0d98156ada7eac59de97c16499
      
https://github.com/qemu/qemu/commit/a098fbc025095a0d98156ada7eac59de97c16499
  Author: Peter Maydell <address@hidden>
  Date:   2016-07-18 (Mon, 18 Jul 2016)

  Changed paths:
    M MAINTAINERS
    M aio-posix.c
    M aio-win32.c
    M async.c
    M block/linux-aio.c
    R block/raw-aio.h
    M block/raw-posix.c
    M block/raw-win32.c
    M block/win32-aio.c
    M docs/specs/parallels.txt
    M hw/block/dataplane/virtio-blk.c
    M include/block/aio.h
    A include/block/raw-aio.h
    M scripts/checkpatch.pl

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

# gpg: Signature made Mon 18 Jul 2016 17:58:27 BST
# gpg:                using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <address@hidden>"
# gpg:                 aka "Stefan Hajnoczi <address@hidden>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  MAINTAINERS: Add include/block/aio.h to block I/O path section
  virtio-blk: dataplane cleanup
  checkpatch: consider git extended headers valid patches
  aio-posix: remove useless parameter
  linux-aio: prevent submitting more than MAX_EVENTS
  aio_ctx_check: follow CODING_STYLE
  linux-aio: share one LinuxAioState within an AioContext
  spec/parallels: fix a mistake

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/3913d3707e3d...a098fbc02509