[PULL 00/18] Block layer patches

Failed in applying to current master (apply log)
Maintainers: Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, John Snow <jsnow@redhat.com>, Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>, Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>, Paolo Bonzini <pbonzini@redhat.com>, Fam Zheng <fam@euphon.net>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Eric Blake <eblake@redhat.com>, Markus Armbruster <armbru@redhat.com>, "Alex Bennée" <alex.bennee@linaro.org>, Peter Maydell <peter.maydell@linaro.org>, Fabiano Rosas <farosas@suse.de>, Laurent Vivier <lvivier@redhat.com>
There is a newer version of this series
qapi/block-core.json                               |   56 +-
docs/about/deprecated.rst                          |    8 -
docs/about/removed-features.rst                    |    7 +
docs/system/device-url-syntax.rst.inc              |   39 -
docs/system/qemu-block-drivers.rst.inc             |   84 -
meson_options.txt                                  |    2 -
include/block/block-common.h                       |   11 +-
include/hw/block/block.h                           |   12 +
include/system/block-backend-io.h                  |    6 +-
block/blkdebug.c                                   |   15 +-
block/block-backend.c                              |   47 +-
block/commit.c                                     |   10 +-
block/export/virtio-blk-handler.c                  |    2 +-
block/gluster.c                                    | 1644 --------------------
block/graph-lock.c                                 |   12 +-
block/mirror.c                                     |    4 +-
block/monitor/block-hmp-cmds.c                     |   38 +-
block/qcow2-cluster.c                              |   52 +-
hw/ide/core.c                                      |  110 +-
hw/scsi/scsi-bus.c                                 |    7 +-
nbd/server.c                                       |    2 +-
qemu-io-cmds.c                                     |  117 +-
tests/qtest/ide-test.c                             |  137 +-
tests/qtest/modules-test.c                         |    3 -
tests/unit/test-block-iothread.c                   |    4 +-
MAINTAINERS                                        |   11 +-
block/meson.build                                  |    1 -
meson.build                                        |   47 -
scripts/ci/setup/debian/debian-13-ppc64le.yaml     |    1 -
scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml   |    1 -
scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml     |    1 -
scripts/coverity-scan/coverity-scan.docker         |    1 -
scripts/coverity-scan/run-coverity-scan            |    2 +-
scripts/meson-buildoptions.sh                      |    3 -
tests/docker/dockerfiles/debian-amd64-cross.docker |    1 -
tests/docker/dockerfiles/debian-arm64-cross.docker |    1 -
.../dockerfiles/debian-mips64el-cross.docker       |    1 -
.../docker/dockerfiles/debian-mipsel-cross.docker  |    1 -
.../docker/dockerfiles/debian-ppc64el-cross.docker |    1 -
.../docker/dockerfiles/debian-riscv64-cross.docker |    1 -
tests/docker/dockerfiles/debian-s390x-cross.docker |    1 -
tests/docker/dockerfiles/debian.docker             |    1 -
.../docker/dockerfiles/fedora-rust-nightly.docker  |    1 -
tests/docker/dockerfiles/fedora.docker             |    1 -
tests/docker/dockerfiles/opensuse-leap.docker      |    1 -
tests/docker/dockerfiles/ubuntu2204.docker         |    1 -
tests/lcitool/projects/qemu.yml                    |    1 -
tests/qemu-iotests/046                             |   46 +
tests/qemu-iotests/046.out                         |   36 +
49 files changed, 537 insertions(+), 2055 deletions(-)
delete mode 100644 block/gluster.c
[PULL 00/18] Block layer patches
Posted by Kevin Wolf 1 week, 4 days ago
The following changes since commit 6d17fd91f6cf88df5cb2205e578640d72605cc43:

  Merge tag 'pull-nvme-20260518' of https://gitlab.com/birkelund/qemu into staging (2026-05-18 08:33:20 -0400)

are available in the Git repository at:

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

for you to fetch changes up to 8b663f7d0d96d915d0e0fc5923dc6cc36133f19f:

  block: Improve readability in HMP 'info blockstats' output (2026-05-19 17:34:13 +0200)

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

- qcow2: Fix corruption on discard during write with COW
- Remove the deprecated glusterfs block driver
- graph-lock: fix missed wakeup in bdrv_graph_co_rdunlock()
- ide: Fix deadlock between TRIM and drain
- scsi: Fix discard_granularity for -drive if=scsi
- blkdebug: Add 'delay-ns' option
- qemu-io: Add 'aio_discard' command
- Improve readability in HMP 'info blockstats' output
- MAINTAINERS: Lukas Straub will maintain COLO block replication

----------------------------------------------------------------
Denis V. Lunev (1):
      block/graph-lock: fix missed wakeup in bdrv_graph_co_rdunlock()

Kevin Wolf (14):
      blkdebug: Add 'delay-ns' option
      block: Add blk_co_start/end_request() and BDRV_REQ_NO_QUEUE
      block: Add flags parameter to blk_*_pdiscard()
      ide: Minimal fix for deadlock between TRIM and drain
      ide: Clean up ide_trim_co_entry() to be idiomatic coroutine code
      ide-test: Factor out wait_dma_completion()
      ide-test: Test reset during TRIM
      block: Create DEFAULT_BLOCK_CONF macro
      block: Add more defaults to DEFAULT_BLOCK_CONF
      commit: Drain nodes across all of bdrv_commit()
      qemu-io: Add 'aio_discard' command
      qcow2: Fix corruption on discard during write with COW
      iotests/046: Test that discard/write_zeroes wait for dependencies
      block: Improve readability in HMP 'info blockstats' output

Lukas Straub (2):
      MAINTAINERS: Add myself as maintainer for replication
      MAINTAINERS: Rename Replication -> COLO block replication

Thomas Huth (1):
      Remove the deprecated glusterfs block driver

 qapi/block-core.json                               |   56 +-
 docs/about/deprecated.rst                          |    8 -
 docs/about/removed-features.rst                    |    7 +
 docs/system/device-url-syntax.rst.inc              |   39 -
 docs/system/qemu-block-drivers.rst.inc             |   84 -
 meson_options.txt                                  |    2 -
 include/block/block-common.h                       |   11 +-
 include/hw/block/block.h                           |   12 +
 include/system/block-backend-io.h                  |    6 +-
 block/blkdebug.c                                   |   15 +-
 block/block-backend.c                              |   47 +-
 block/commit.c                                     |   10 +-
 block/export/virtio-blk-handler.c                  |    2 +-
 block/gluster.c                                    | 1644 --------------------
 block/graph-lock.c                                 |   12 +-
 block/mirror.c                                     |    4 +-
 block/monitor/block-hmp-cmds.c                     |   38 +-
 block/qcow2-cluster.c                              |   52 +-
 hw/ide/core.c                                      |  110 +-
 hw/scsi/scsi-bus.c                                 |    7 +-
 nbd/server.c                                       |    2 +-
 qemu-io-cmds.c                                     |  117 +-
 tests/qtest/ide-test.c                             |  137 +-
 tests/qtest/modules-test.c                         |    3 -
 tests/unit/test-block-iothread.c                   |    4 +-
 MAINTAINERS                                        |   11 +-
 block/meson.build                                  |    1 -
 meson.build                                        |   47 -
 scripts/ci/setup/debian/debian-13-ppc64le.yaml     |    1 -
 scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml   |    1 -
 scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml     |    1 -
 scripts/coverity-scan/coverity-scan.docker         |    1 -
 scripts/coverity-scan/run-coverity-scan            |    2 +-
 scripts/meson-buildoptions.sh                      |    3 -
 tests/docker/dockerfiles/debian-amd64-cross.docker |    1 -
 tests/docker/dockerfiles/debian-arm64-cross.docker |    1 -
 .../dockerfiles/debian-mips64el-cross.docker       |    1 -
 .../docker/dockerfiles/debian-mipsel-cross.docker  |    1 -
 .../docker/dockerfiles/debian-ppc64el-cross.docker |    1 -
 .../docker/dockerfiles/debian-riscv64-cross.docker |    1 -
 tests/docker/dockerfiles/debian-s390x-cross.docker |    1 -
 tests/docker/dockerfiles/debian.docker             |    1 -
 .../docker/dockerfiles/fedora-rust-nightly.docker  |    1 -
 tests/docker/dockerfiles/fedora.docker             |    1 -
 tests/docker/dockerfiles/opensuse-leap.docker      |    1 -
 tests/docker/dockerfiles/ubuntu2204.docker         |    1 -
 tests/lcitool/projects/qemu.yml                    |    1 -
 tests/qemu-iotests/046                             |   46 +
 tests/qemu-iotests/046.out                         |   36 +
 49 files changed, 537 insertions(+), 2055 deletions(-)
 delete mode 100644 block/gluster.c
Re: [PULL 00/18] Block layer patches
Posted by Stefan Hajnoczi 1 week, 3 days ago
Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/11.1 for any user-visible changes.