The following changes since commit 5619c179057e24195ff19c8fe6d6a6cbcb16ed28:

  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20170731' into staging (2017-07-31 14:45:42 +0100)

are available in the git repository at:

  git://repo.or.cz/qemu/kevin.git tags/for-upstream

for you to fetch changes up to 9ae03670701fea9124f4f1a6d4b6d1badbf9e485:

  block/qapi: Remove redundant NULL check to silence Coverity (2017-08-01 15:26:04 +0200)

----------------------------------------------------------------
Block layer patches for 2.10.0-rc1

----------------------------------------------------------------
Eric Blake (2):
      iotests: Check dirty bitmap statistics in 124
      iotests: Add test of recent fix to 'qemu-img measure'

Kevin Wolf (8):
      qemu-iotests/041: Fix leaked scratch images
      qemu-iotests: Remove blkdebug.conf after tests
      qemu-iotests/141: Fix image cleanup
      qemu-iotests/153: Fix leaked scratch images
      qemu-iotests/162: Fix leaked temporary files
      qemu-iotests/063: Fix leaked image
      qemu-iotests/059: Fix leaked image files
      block/qapi: Remove redundant NULL check to silence Coverity

Manos Pitsidianakis (2):
      block: fix dangling bs->explicit_options in block.c
      block: fix leaks in bdrv_open_driver()

Max Reitz (2):
      iotests: Fix test 156
      iotests: Redirect stderr to stdout in 186

Stefan Hajnoczi (1):
      docs: add qemu-block-drivers(7) man page

 block.c                      |  24 +-
 block/qapi.c                 |   3 +-
 Makefile                     |  23 +-
 docs/qemu-block-drivers.texi | 799 +++++++++++++++++++++++++++++++++++++++++++
 qemu-doc.texi                | 780 +-----------------------------------------
 tests/qemu-iotests/041       |   4 +-
 tests/qemu-iotests/059       |  11 +-
 tests/qemu-iotests/059.out   |  22 +-
 tests/qemu-iotests/063       |   4 +-
 tests/qemu-iotests/074       |   1 +
 tests/qemu-iotests/124       |   7 +-
 tests/qemu-iotests/141       |   2 +-
 tests/qemu-iotests/153       |   1 +
 tests/qemu-iotests/156       |   4 +-
 tests/qemu-iotests/162       |   7 +
 tests/qemu-iotests/179       |   1 +
 tests/qemu-iotests/186       |   2 +-
 tests/qemu-iotests/186.out   |  12 +-
 tests/qemu-iotests/190       |  59 ++++
 tests/qemu-iotests/190.out   |  11 +
 tests/qemu-iotests/common.rc |   3 +
 tests/qemu-iotests/group     |   1 +
 22 files changed, 958 insertions(+), 823 deletions(-)
 create mode 100644 docs/qemu-block-drivers.texi
 create mode 100755 tests/qemu-iotests/190
 create mode 100644 tests/qemu-iotests/190.out

On 1 August 2017 at 15:46, Kevin Wolf <kwolf@redhat.com> wrote:
> The following changes since commit 5619c179057e24195ff19c8fe6d6a6cbcb16ed28:
>
>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20170731' into staging (2017-07-31 14:45:42 +0100)
>
> are available in the git repository at:
>
>   git://repo.or.cz/qemu/kevin.git tags/for-upstream
>
> for you to fetch changes up to 9ae03670701fea9124f4f1a6d4b6d1badbf9e485:
>
>   block/qapi: Remove redundant NULL check to silence Coverity (2017-08-01 15:26:04 +0200)
>
> ----------------------------------------------------------------
> Block layer patches for 2.10.0-rc1
>
> ----------------------------------------------------------------

Hi; I'm afraid the docs changes in this pull upset some of
my test machines:

NetBSD, OpenBSD, OSX:

  GEN     docs/qemu-block-drivers.html
/root/qemu/docs/qemu-block-drivers.texi:800: Unmatched `@end'.
makeinfo: Removing output file `docs/qemu-block-drivers.html' due to
errors; use --force to preserve.
Makefile:692: recipe for target 'docs/qemu-block-drivers.html' failed

(and same error again trying to build the .txt file)

S390x, PPC64 Linux give a warning:
  GEN     docs/qemu-block-drivers.html
/home/linux1/qemu/docs/qemu-block-drivers.texi: warning: must specify
a title with a title command or @top

(Other hosts still running the build job.)

thanks
-- PMM

Am 01.08.2017 um 18:01 hat Peter Maydell geschrieben:
> On 1 August 2017 at 15:46, Kevin Wolf <kwolf@redhat.com> wrote:
> > The following changes since commit 5619c179057e24195ff19c8fe6d6a6cbcb16ed28:
> >
> >   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20170731' into staging (2017-07-31 14:45:42 +0100)
> >
> > are available in the git repository at:
> >
> >   git://repo.or.cz/qemu/kevin.git tags/for-upstream
> >
> > for you to fetch changes up to 9ae03670701fea9124f4f1a6d4b6d1badbf9e485:
> >
> >   block/qapi: Remove redundant NULL check to silence Coverity (2017-08-01 15:26:04 +0200)
> >
> > ----------------------------------------------------------------
> > Block layer patches for 2.10.0-rc1
> >
> > ----------------------------------------------------------------
> 
> Hi; I'm afraid the docs changes in this pull upset some of
> my test machines:
> 
> NetBSD, OpenBSD, OSX:
> 
>   GEN     docs/qemu-block-drivers.html
> /root/qemu/docs/qemu-block-drivers.texi:800: Unmatched `@end'.
> makeinfo: Removing output file `docs/qemu-block-drivers.html' due to
> errors; use --force to preserve.
> Makefile:692: recipe for target 'docs/qemu-block-drivers.html' failed
> 
> (and same error again trying to build the .txt file)
> 
> S390x, PPC64 Linux give a warning:
>   GEN     docs/qemu-block-drivers.html
> /home/linux1/qemu/docs/qemu-block-drivers.texi: warning: must specify
> a title with a title command or @top
> 
> (Other hosts still running the build job.)

I'm dropping the patch and sending v2.

Kevin