The following changes since commit 4da5c51cac8363f86ec92dc99c38f9382d617647:

  Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-12-20' into staging (2017-12-20 20:38:36 +0000)

are available in the git repository at:

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

for you to fetch changes up to af65cdae56861d5e163559a53f7ec34142a249f1:

  nvme: Add tracing (2017-12-21 16:02:14 +0100)

----------------------------------------------------------------
Block layer patches

----------------------------------------------------------------
Doug Gale (1):
      nvme: Add tracing

Edgar Kaziakhmedov (1):
      qcow2: get rid of qcow2_backing_read1 routine

Fam Zheng (1):
      qemu-img: Document --force-share / -U

John Snow (1):
      iotests: fix 197 for vpc

Kevin Wolf (9):
      block: Formats don't need CONSISTENT_READ with NO_IO
      block: Make bdrv_drain_invoke() recursive
      block: Call .drain_begin only once in bdrv_drain_all_begin()
      test-bdrv-drain: Test BlockDriver callbacks for drain
      block: bdrv_drain_recurse(): Remove unused begin parameter
      block: Don't wait for requests in bdrv_drain*_end()
      block: Unify order in drain functions
      block: Don't acquire AioContext in hmp_qemu_io()
      block: Document that x-blockdev-change breaks quorum children list

 qapi/block-core.json             |   4 +
 block/qcow2.h                    |   3 -
 block.c                          |   6 +-
 block/io.c                       |  31 ++--
 block/qcow2.c                    |  51 +-----
 hmp.c                            |   6 -
 hw/block/nvme.c                  | 349 +++++++++++++++++++++++++++++++++------
 tests/test-bdrv-drain.c          | 137 +++++++++++++++
 hw/block/trace-events            |  93 +++++++++++
 qemu-img.texi                    |   9 +
 tests/Makefile.include           |   2 +
 tests/qemu-iotests/197           |   4 +
 tests/qemu-iotests/common.filter |   3 +-
 13 files changed, 581 insertions(+), 117 deletions(-)
 create mode 100644 tests/test-bdrv-drain.c

On 21 December 2017 at 15:26, Kevin Wolf <kwolf@redhat.com> wrote:
> The following changes since commit 4da5c51cac8363f86ec92dc99c38f9382d617647:
>
>   Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-12-20' into staging (2017-12-20 20:38:36 +0000)
>
> are available in the git repository at:
>
>   git://repo.or.cz/qemu/kevin.git tags/for-upstream
>
> for you to fetch changes up to af65cdae56861d5e163559a53f7ec34142a249f1:
>
>   nvme: Add tracing (2017-12-21 16:02:14 +0100)
>
> ----------------------------------------------------------------
> Block layer patches
>
> ----------------------------------------------------------------

Now I get these warnings on NetBSD/OpenBSD/OSX:

  GEN     qemu-doc.txt
/root/qemu/qemu-doc.texi:8: warning: unrecognized encoding name `UTF-8'.
/root/qemu//qemu-img.texi:61: warning: unlikely character ( in @var.
/root/qemu//qemu-img.texi:61: warning: unlikely character ) in @var.

The UTF-8 one is longstanding and ignorable, but the other two are new.

thanks
-- PMM

Am 21.12.2017 um 23:47 hat Peter Maydell geschrieben:
> On 21 December 2017 at 15:26, Kevin Wolf <kwolf@redhat.com> wrote:
> > The following changes since commit 4da5c51cac8363f86ec92dc99c38f9382d617647:
> >
> >   Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-12-20' into staging (2017-12-20 20:38:36 +0000)
> >
> > are available in the git repository at:
> >
> >   git://repo.or.cz/qemu/kevin.git tags/for-upstream
> >
> > for you to fetch changes up to af65cdae56861d5e163559a53f7ec34142a249f1:
> >
> >   nvme: Add tracing (2017-12-21 16:02:14 +0100)
> >
> > ----------------------------------------------------------------
> > Block layer patches
> >
> > ----------------------------------------------------------------
> 
> Now I get these warnings on NetBSD/OpenBSD/OSX:
> 
>   GEN     qemu-doc.txt
> /root/qemu/qemu-doc.texi:8: warning: unrecognized encoding name `UTF-8'.
> /root/qemu//qemu-img.texi:61: warning: unlikely character ( in @var.
> /root/qemu//qemu-img.texi:61: warning: unlikely character ) in @var.

Fam, I'm dropping "qemu-img: Document --force-share / -U" from my pull
request again.

The problem there seems to be that we're inside of a '@table @var' here.
People have been careless enough to add options in there, which results
in less than optimal formatting in the manpage.

I'd suggest that we split the table in two, first a '@table @var' that
explains only variables, and after that a proper '@table @option' for
the options. I suppose (and hope) that in '@table @option', parentheses
are allowed.

Kevin

On Fri, 12/22 14:31, Kevin Wolf wrote:
> Am 21.12.2017 um 23:47 hat Peter Maydell geschrieben:
> > On 21 December 2017 at 15:26, Kevin Wolf <kwolf@redhat.com> wrote:
> > > The following changes since commit 4da5c51cac8363f86ec92dc99c38f9382d617647:
> > >
> > >   Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-12-20' into staging (2017-12-20 20:38:36 +0000)
> > >
> > > are available in the git repository at:
> > >
> > >   git://repo.or.cz/qemu/kevin.git tags/for-upstream
> > >
> > > for you to fetch changes up to af65cdae56861d5e163559a53f7ec34142a249f1:
> > >
> > >   nvme: Add tracing (2017-12-21 16:02:14 +0100)
> > >
> > > ----------------------------------------------------------------
> > > Block layer patches
> > >
> > > ----------------------------------------------------------------
> > 
> > Now I get these warnings on NetBSD/OpenBSD/OSX:
> > 
> >   GEN     qemu-doc.txt
> > /root/qemu/qemu-doc.texi:8: warning: unrecognized encoding name `UTF-8'.
> > /root/qemu//qemu-img.texi:61: warning: unlikely character ( in @var.
> > /root/qemu//qemu-img.texi:61: warning: unlikely character ) in @var.
> 
> Fam, I'm dropping "qemu-img: Document --force-share / -U" from my pull
> request again.
> 
> The problem there seems to be that we're inside of a '@table @var' here.
> People have been careless enough to add options in there, which results
> in less than optimal formatting in the manpage.
> 
> I'd suggest that we split the table in two, first a '@table @var' that
> explains only variables, and after that a proper '@table @option' for
> the options. I suppose (and hope) that in '@table @option', parentheses
> are allowed.

Sounds good. Thank you, v5 sent.

Fam