[PULL 0/6] Block patches

Stefan Hajnoczi posted 6 patches 2 weeks, 1 day ago
Failed in applying to current master (apply log)
include/block/aio.h             |  4 +-
include/hw/virtio/virtio-blk.h  |  2 +-
include/hw/virtio/virtio.h      |  5 +-
util/aio-posix.h                |  1 +
block/curl.c                    | 11 ++--
block/export/fuse.c             |  4 +-
block/io_uring.c                | 19 ++++---
block/iscsi.c                   |  4 +-
block/linux-aio.c               | 16 +++---
block/nfs.c                     |  6 +--
block/nvme.c                    | 51 ++++++++++++-------
block/ssh.c                     |  4 +-
block/win32-aio.c               |  4 +-
hw/block/dataplane/virtio-blk.c | 16 +-----
hw/block/virtio-blk.c           | 14 ++----
hw/scsi/virtio-scsi-dataplane.c | 60 +++-------------------
hw/scsi/virtio-scsi.c           |  2 +-
hw/virtio/virtio.c              | 73 +++++++++------------------
hw/xen/xen-bus.c                |  6 +--
io/channel-command.c            |  6 ++-
io/channel-file.c               |  3 +-
io/channel-socket.c             |  3 +-
migration/rdma.c                |  8 +--
tests/unit/test-aio.c           |  4 +-
tests/unit/test-fdmon-epoll.c   |  4 +-
util/aio-posix.c                | 89 +++++++++++++++++++++++++--------
util/aio-win32.c                |  4 +-
util/async.c                    | 10 +++-
util/main-loop.c                |  4 +-
util/qemu-coroutine-io.c        |  5 +-
util/vhost-user-server.c        | 11 ++--
31 files changed, 221 insertions(+), 232 deletions(-)

[PULL 0/6] Block patches

Posted by Stefan Hajnoczi 2 weeks, 1 day ago
The following changes since commit 91f5f7a5df1fda8c34677a7c49ee8a4bb5b56a36:

  Merge remote-tracking branch 'remotes/lvivier-gitlab/tags/linux-user-for-7.0-pull-request' into staging (2022-01-12 11:51:47 +0000)

are available in the Git repository at:

  https://gitlab.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to db608fb78444c58896db69495729e4458eeaace1:

  virtio: unify dataplane and non-dataplane ->handle_output() (2022-01-12 17:09:39 +0000)

----------------------------------------------------------------
Pull request

----------------------------------------------------------------

Stefan Hajnoczi (6):
  aio-posix: split poll check from ready handler
  virtio: get rid of VirtIOHandleAIOOutput
  virtio-blk: drop unused virtio_blk_handle_vq() return value
  virtio-scsi: prepare virtio_scsi_handle_cmd for dataplane
  virtio: use ->handle_output() instead of ->handle_aio_output()
  virtio: unify dataplane and non-dataplane ->handle_output()

 include/block/aio.h             |  4 +-
 include/hw/virtio/virtio-blk.h  |  2 +-
 include/hw/virtio/virtio.h      |  5 +-
 util/aio-posix.h                |  1 +
 block/curl.c                    | 11 ++--
 block/export/fuse.c             |  4 +-
 block/io_uring.c                | 19 ++++---
 block/iscsi.c                   |  4 +-
 block/linux-aio.c               | 16 +++---
 block/nfs.c                     |  6 +--
 block/nvme.c                    | 51 ++++++++++++-------
 block/ssh.c                     |  4 +-
 block/win32-aio.c               |  4 +-
 hw/block/dataplane/virtio-blk.c | 16 +-----
 hw/block/virtio-blk.c           | 14 ++----
 hw/scsi/virtio-scsi-dataplane.c | 60 +++-------------------
 hw/scsi/virtio-scsi.c           |  2 +-
 hw/virtio/virtio.c              | 73 +++++++++------------------
 hw/xen/xen-bus.c                |  6 +--
 io/channel-command.c            |  6 ++-
 io/channel-file.c               |  3 +-
 io/channel-socket.c             |  3 +-
 migration/rdma.c                |  8 +--
 tests/unit/test-aio.c           |  4 +-
 tests/unit/test-fdmon-epoll.c   |  4 +-
 util/aio-posix.c                | 89 +++++++++++++++++++++++++--------
 util/aio-win32.c                |  4 +-
 util/async.c                    | 10 +++-
 util/main-loop.c                |  4 +-
 util/qemu-coroutine-io.c        |  5 +-
 util/vhost-user-server.c        | 11 ++--
 31 files changed, 221 insertions(+), 232 deletions(-)

-- 
2.34.1



Re: [PULL 0/6] Block patches

Posted by Peter Maydell 1 week, 6 days ago
On Wed, 12 Jan 2022 at 17:14, Stefan Hajnoczi <stefanha@redhat.com> wrote:
>
> The following changes since commit 91f5f7a5df1fda8c34677a7c49ee8a4bb5b56a36:
>
>   Merge remote-tracking branch 'remotes/lvivier-gitlab/tags/linux-user-for-7.0-pull-request' into staging (2022-01-12 11:51:47 +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/stefanha/qemu.git tags/block-pull-request
>
> for you to fetch changes up to db608fb78444c58896db69495729e4458eeaace1:
>
>   virtio: unify dataplane and non-dataplane ->handle_output() (2022-01-12 17:09:39 +0000)
>
> ----------------------------------------------------------------
> Pull request
>

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

thanks
-- PMM