[Qemu-devel] [PULL 00/14] Block layer patches

Kevin Wolf posted 14 patches 6 years, 3 months ago
Failed in applying to current master (apply log)
There is a newer version of this series
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                  | 367 ++++++++++++++++++++++++++++++++-------
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, 591 insertions(+), 125 deletions(-)
create mode 100644 tests/test-bdrv-drain.c
[Qemu-devel] [PULL 00/14] Block layer patches
Posted by Kevin Wolf 6 years, 3 months ago
The following changes since commit af352675efb7e92a1f5f6461a042a12015ab3d12:

  Merge remote-tracking branch 'remotes/aurel/tags/pull-target-sh4-20171218' into staging (2017-12-19 19:11:11 +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 b4d526c87b26aff6d8b353951aa175a1236ad887:

  nvme: Add tracing (2017-12-20 11:05:49 +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

Mao Zhongyi (1):
      hw/block/nvme: Convert to realize

 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                  | 367 ++++++++++++++++++++++++++++++++-------
 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, 591 insertions(+), 125 deletions(-)
 create mode 100644 tests/test-bdrv-drain.c

Re: [Qemu-devel] [PULL 00/14] Block layer patches
Posted by Peter Maydell 6 years, 3 months ago
On 20 December 2017 at 13:19, Kevin Wolf <kwolf@redhat.com> wrote:
> The following changes since commit af352675efb7e92a1f5f6461a042a12015ab3d12:
>
>   Merge remote-tracking branch 'remotes/aurel/tags/pull-target-sh4-20171218' into staging (2017-12-19 19:11:11 +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 b4d526c87b26aff6d8b353951aa175a1236ad887:
>
>   nvme: Add tracing (2017-12-20 11:05:49 +0100)
>
> ----------------------------------------------------------------
> Block layer patches

Hi; this has a merge conflict in hw/block/nvme.c where both
sets of changes are changing the way that the function
handles errors, and I'm not sure which is correct. Can you
resolve and resend, please?

thanks
-- PMM