mbox series

[PULL,00/30] Block patches

Message ID 20201009193529.322822-1-stefanha@redhat.com
Headers show
Series Block patches | expand

Message

Stefan Hajnoczi Oct. 9, 2020, 7:34 p.m. UTC
The following changes since commit 497d415d76b9f59fcae27f22df1ca2c3fa4df64e:

  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20201008-1' into staging (2020-10-08 21:41:20 +0100)

are available in the Git repository at:

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

for you to fetch changes up to e969c7b045c90368bc3a5db3479e70b6f0ecb828:

  iotests: add commit top->base cases to 274 (2020-10-09 14:32:24 +0100)

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

This pull request includes the vhost-user-blk server by Coiby Xu, the block
coroutine code generator by Vladimir Sementsov-Ogievskiy, nvme block driver
statistics by Philippe Mathieu-Daudé, and cleanups/fixes/additions to the
vhost-user-blk server by me.

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

Coiby Xu (7):
  libvhost-user: Allow vu_message_read to be replaced
  libvhost-user: remove watch for kick_fd when de-initialize vu-dev
  util/vhost-user-server: generic vhost user server
  block: move logical block size check function to a common utility
    function
  block/export: vhost-user block device backend server
  test: new qTest case to test the vhost-user-blk-server
  MAINTAINERS: Add vhost-user block device backend server maintainer

Philippe Mathieu-Daudé (1):
  block/nvme: Add driver statistics for access alignment and hw errors

Stefan Hajnoczi (17):
  util/vhost-user-server: s/fileds/fields/ typo fix
  util/vhost-user-server: drop unnecessary QOM cast
  util/vhost-user-server: drop unnecessary watch deletion
  block/export: consolidate request structs into VuBlockReq
  util/vhost-user-server: drop unused DevicePanicNotifier
  util/vhost-user-server: fix memory leak in vu_message_read()
  util/vhost-user-server: check EOF when reading payload
  util/vhost-user-server: rework vu_client_trip() coroutine lifecycle
  block/export: report flush errors
  block/export: convert vhost-user-blk server to block export API
  util/vhost-user-server: move header to include/
  util/vhost-user-server: use static library in meson.build
  qemu-storage-daemon: avoid compiling blockdev_ss twice
  block: move block exports to libblockdev
  block/export: add iothread and fixed-iothread options
  block/export: add vhost-user-blk multi-queue support
  tests/qtest: add multi-queue test case to vhost-user-blk-test

Vladimir Sementsov-Ogievskiy (5):
  block/io: fix bdrv_co_block_status_above
  block/io: bdrv_common_block_status_above: support include_base
  block/io: bdrv_common_block_status_above: support bs == base
  block/io: fix bdrv_is_allocated_above
  iotests: add commit top->base cases to 274

 MAINTAINERS                                |  10 +
 qapi/block-core.json                       |  24 +-
 qapi/block-export.json                     |  36 +-
 block/coroutines.h                         |   2 +
 block/export/vhost-user-blk-server.h       |  19 +
 contrib/libvhost-user/libvhost-user.h      |  21 +
 include/qemu/vhost-user-server.h           |  65 ++
 tests/qtest/libqos/libqtest.h              |  17 +
 tests/qtest/libqos/vhost-user-blk.h        |  48 ++
 util/block-helpers.h                       |  19 +
 block/export/export.c                      |  37 +-
 block/export/vhost-user-blk-server.c       | 431 +++++++++++
 block/io.c                                 | 132 ++--
 block/nvme.c                               |  27 +
 block/qcow2.c                              |  16 +-
 contrib/libvhost-user/libvhost-user-glib.c |   2 +-
 contrib/libvhost-user/libvhost-user.c      |  15 +-
 hw/core/qdev-properties-system.c           |  31 +-
 nbd/server.c                               |   2 -
 qemu-nbd.c                                 |  21 +-
 softmmu/vl.c                               |   4 +
 stubs/blk-exp-close-all.c                  |   7 +
 tests/qtest/libqos/vhost-user-blk.c        | 129 ++++
 tests/qtest/libqtest.c                     |  36 +-
 tests/qtest/vhost-user-blk-test.c          | 822 +++++++++++++++++++++
 tests/vhost-user-bridge.c                  |   2 +
 tools/virtiofsd/fuse_virtio.c              |   4 +-
 util/block-helpers.c                       |  46 ++
 util/vhost-user-server.c                   | 446 +++++++++++
 block/export/meson.build                   |   3 +-
 contrib/libvhost-user/meson.build          |   1 +
 meson.build                                |  22 +-
 nbd/meson.build                            |   2 +
 storage-daemon/meson.build                 |   3 +-
 stubs/meson.build                          |   1 +
 tests/qemu-iotests/274                     |  20 +
 tests/qemu-iotests/274.out                 |  68 ++
 tests/qtest/libqos/meson.build             |   1 +
 tests/qtest/meson.build                    |   4 +-
 util/meson.build                           |   4 +
 40 files changed, 2476 insertions(+), 124 deletions(-)
 create mode 100644 block/export/vhost-user-blk-server.h
 create mode 100644 include/qemu/vhost-user-server.h
 create mode 100644 tests/qtest/libqos/vhost-user-blk.h
 create mode 100644 util/block-helpers.h
 create mode 100644 block/export/vhost-user-blk-server.c
 create mode 100644 stubs/blk-exp-close-all.c
 create mode 100644 tests/qtest/libqos/vhost-user-blk.c
 create mode 100644 tests/qtest/vhost-user-blk-test.c
 create mode 100644 util/block-helpers.c
 create mode 100644 util/vhost-user-server.c

-- 
2.26.2

Comments

no-reply@patchew.org Oct. 9, 2020, 8:21 p.m. UTC | #1
Patchew URL: https://patchew.org/QEMU/20201009193529.322822-1-stefanha@redhat.com/



Hi,

This series seems to have some coding style problems. See output below for
more information:

Type: series
Message-id: 20201009193529.322822-1-stefanha@redhat.com
Subject: [PULL 00/30] Block patches

=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
 * [new tag]         patchew/20201009193529.322822-1-stefanha@redhat.com -> patchew/20201009193529.322822-1-stefanha@redhat.com
Switched to a new branch 'test'
558aeb6 iotests: add commit top->base cases to 274
416e0aa block/io: fix bdrv_is_allocated_above
f7d6e64 block/io: bdrv_common_block_status_above: support bs == base
c44816a block/io: bdrv_common_block_status_above: support include_base
2be1d39 block/io: fix bdrv_co_block_status_above
e5ce70f tests/qtest: add multi-queue test case to vhost-user-blk-test
49bc904 block/export: add vhost-user-blk multi-queue support
9762d3d block/export: add iothread and fixed-iothread options
5d7df87 block: move block exports to libblockdev
ad289b0 qemu-storage-daemon: avoid compiling blockdev_ss twice
3c12eda util/vhost-user-server: use static library in meson.build
d2632bb util/vhost-user-server: move header to include/
65df69a block/export: convert vhost-user-blk server to block export API
063d99d block/export: report flush errors
f8dc04d util/vhost-user-server: rework vu_client_trip() coroutine lifecycle
b4f0a4f util/vhost-user-server: check EOF when reading payload
c670f8a util/vhost-user-server: fix memory leak in vu_message_read()
1c0215a util/vhost-user-server: drop unused DevicePanicNotifier
95c5f38 block/export: consolidate request structs into VuBlockReq
12be4d6 util/vhost-user-server: drop unnecessary watch deletion
fb07eed util/vhost-user-server: drop unnecessary QOM cast
f4c201a util/vhost-user-server: s/fileds/fields/ typo fix
183b447 MAINTAINERS: Add vhost-user block device backend server maintainer
9037906 test: new qTest case to test the vhost-user-blk-server
709e271 block/export: vhost-user block device backend server
7098edb block: move logical block size check function to a common utility function
6116f4b util/vhost-user-server: generic vhost user server
a8a3fa5 libvhost-user: remove watch for kick_fd when de-initialize vu-dev
4f6e808 libvhost-user: Allow vu_message_read to be replaced
f4f9ed3 block/nvme: Add driver statistics for access alignment and hw errors

=== OUTPUT BEGIN ===
1/30 Checking commit f4f9ed389d75 (block/nvme: Add driver statistics for access alignment and hw errors)
2/30 Checking commit 4f6e8088ba93 (libvhost-user: Allow vu_message_read to be replaced)
WARNING: Block comments use a leading /* on a separate line
#130: FILE: contrib/libvhost-user/libvhost-user.h:395:
+    /* @read_msg: custom method to read vhost-user message

total: 0 errors, 1 warnings, 139 lines checked

Patch 2/30 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
3/30 Checking commit a8a3fa52af0e (libvhost-user: remove watch for kick_fd when de-initialize vu-dev)
4/30 Checking commit 6116f4b2b35e (util/vhost-user-server: generic vhost user server)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#33: 
new file mode 100644

WARNING: line over 80 characters
#85: FILE: util/vhost-user-server.c:48:
+    /* When this is set vu_client_trip will stop new processing vhost-user message */

total: 0 errors, 2 warnings, 500 lines checked

Patch 4/30 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
5/30 Checking commit 7098edb0bce9 (block: move logical block size check function to a common utility function)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#85: 
new file mode 100644

total: 0 errors, 1 warnings, 129 lines checked

Patch 5/30 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
6/30 Checking commit 709e271eb771 (block/export: vhost-user block device backend server)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#28: 
new file mode 100644

WARNING: line over 80 characters
#474: FILE: block/export/vhost-user-blk-server.c:442:
+        blk_remove_aio_context_notifier(vu_block_device->backend, blk_aio_attached,

ERROR: g_free(NULL) is safe this check is probably not required
#534: FILE: block/export/vhost-user-blk-server.c:502:
+    if (vus->node_name) {
+        g_free(vus->node_name);

total: 1 errors, 2 warnings, 714 lines checked

Patch 6/30 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

7/30 Checking commit 903790644e16 (test: new qTest case to test the vhost-user-blk-server)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#69: 
new file mode 100644

WARNING: line over 80 characters
#188: FILE: tests/qtest/libqos/vhost-user-blk.c:115:
+    qos_node_create_driver("vhost-user-blk-device", vhost_user_blk_device_create);

total: 0 errors, 2 warnings, 1033 lines checked

Patch 7/30 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
8/30 Checking commit 183b447a91e4 (MAINTAINERS: Add vhost-user block device backend server maintainer)
9/30 Checking commit f4c201a7388c (util/vhost-user-server: s/fileds/fields/ typo fix)
10/30 Checking commit fb07eed52977 (util/vhost-user-server: drop unnecessary QOM cast)
11/30 Checking commit 12be4d67533b (util/vhost-user-server: drop unnecessary watch deletion)
12/30 Checking commit 95c5f38c89fc (block/export: consolidate request structs into VuBlockReq)
13/30 Checking commit 1c0215a2ac69 (util/vhost-user-server: drop unused DevicePanicNotifier)
14/30 Checking commit c670f8ae384a (util/vhost-user-server: fix memory leak in vu_message_read())
15/30 Checking commit b4f0a4f687d4 (util/vhost-user-server: check EOF when reading payload)
16/30 Checking commit f8dc04d8b579 (util/vhost-user-server: rework vu_client_trip() coroutine lifecycle)
17/30 Checking commit 063d99dbbb4a (block/export: report flush errors)
18/30 Checking commit 65df69a0030d (block/export: convert vhost-user-blk server to block export API)
WARNING: line over 80 characters
#858: FILE: util/vhost-user-server.c:415:
+        error_setg(errp, "Only socket address types 'unix' and 'fd' are supported");

total: 0 errors, 1 warnings, 758 lines checked

Patch 18/30 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
19/30 Checking commit d2632bb5d36e (util/vhost-user-server: move header to include/)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#47: 
rename from util/vhost-user-server.h

total: 0 errors, 1 warnings, 29 lines checked

Patch 19/30 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
20/30 Checking commit 3c12edaf51d1 (util/vhost-user-server: use static library in meson.build)
21/30 Checking commit ad289b02cd78 (qemu-storage-daemon: avoid compiling blockdev_ss twice)
22/30 Checking commit 5d7df87d0af7 (block: move block exports to libblockdev)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#130: 
new file mode 100644

total: 0 errors, 1 warnings, 89 lines checked

Patch 22/30 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
23/30 Checking commit 9762d3d9be87 (block/export: add iothread and fixed-iothread options)
24/30 Checking commit 49bc904b223d (block/export: add vhost-user-blk multi-queue support)
25/30 Checking commit e5ce70f3b0e8 (tests/qtest: add multi-queue test case to vhost-user-blk-test)
26/30 Checking commit 2be1d391e5ed (block/io: fix bdrv_co_block_status_above)
27/30 Checking commit c44816a64894 (block/io: bdrv_common_block_status_above: support include_base)
28/30 Checking commit f7d6e64ceaeb (block/io: bdrv_common_block_status_above: support bs == base)
29/30 Checking commit 416e0aa2f311 (block/io: fix bdrv_is_allocated_above)
30/30 Checking commit 558aeb661031 (iotests: add commit top->base cases to 274)
=== OUTPUT END ===

Test command exited with code: 1


The full log is available at
http://patchew.org/logs/20201009193529.322822-1-stefanha@redhat.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
Peter Maydell Oct. 11, 2020, 6:32 p.m. UTC | #2
On Fri, 9 Oct 2020 at 20:35, Stefan Hajnoczi <stefanha@redhat.com> wrote:
>
> The following changes since commit 497d415d76b9f59fcae27f22df1ca2c3fa4df64e:
>
>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20201008-1' into staging (2020-10-08 21:41:20 +0100)
>
> are available in the Git repository at:
>
>   https://gitlab.com/stefanha/qemu.git tags/block-pull-request
>
> for you to fetch changes up to e969c7b045c90368bc3a5db3479e70b6f0ecb828:
>
>   iotests: add commit top->base cases to 274 (2020-10-09 14:32:24 +0100)
>
> ----------------------------------------------------------------
> Pull request
>
> This pull request includes the vhost-user-blk server by Coiby Xu, the block
> coroutine code generator by Vladimir Sementsov-Ogievskiy, nvme block driver
> statistics by Philippe Mathieu-Daudé, and cleanups/fixes/additions to the
> vhost-user-blk server by me.
>

Hi; this seems to have a conflict in qemu-nbd.c with something
that landed in the latest nbd pullreq. Could you fix up and
resend, please?

thanks
-- PMM
Stefan Hajnoczi Oct. 12, 2020, 3:50 p.m. UTC | #3
On Sun, Oct 11, 2020 at 07:32:58PM +0100, Peter Maydell wrote:
> On Fri, 9 Oct 2020 at 20:35, Stefan Hajnoczi <stefanha@redhat.com> wrote:

> >

> > The following changes since commit 497d415d76b9f59fcae27f22df1ca2c3fa4df64e:

> >

> >   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20201008-1' into staging (2020-10-08 21:41:20 +0100)

> >

> > are available in the Git repository at:

> >

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

> >

> > for you to fetch changes up to e969c7b045c90368bc3a5db3479e70b6f0ecb828:

> >

> >   iotests: add commit top->base cases to 274 (2020-10-09 14:32:24 +0100)

> >

> > ----------------------------------------------------------------

> > Pull request

> >

> > This pull request includes the vhost-user-blk server by Coiby Xu, the block

> > coroutine code generator by Vladimir Sementsov-Ogievskiy, nvme block driver

> > statistics by Philippe Mathieu-Daudé, and cleanups/fixes/additions to the

> > vhost-user-blk server by me.

> >

> 

> Hi; this seems to have a conflict in qemu-nbd.c with something

> that landed in the latest nbd pullreq. Could you fix up and

> resend, please?


Thanks for letting me. I will send a v2.

Stefan