mbox series

[PULL,00/13] Block patches

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

Message

Stefan Hajnoczi Sept. 23, 2020, 4:10 p.m. UTC
The following changes since commit 0fc0142828b5bc965790a1c5c6e241897d3387cb:

  Merge remote-tracking branch 'remotes/kraxel/tags/input-20200921-pull-request' into staging (2020-09-22 21:11:10 +0100)

are available in the Git repository at:

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

for you to fetch changes up to d73415a315471ac0b127ed3fad45c8ec5d711de1:

  qemu/atomic.h: rename atomic_ to qatomic_ (2020-09-23 16:07:44 +0100)

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

This includes the atomic_ -> qatomic_ rename that touches many files and is
prone to conflicts.

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

Halil Pasic (1):
  virtio: add vhost-user-fs-ccw device

Marc Hartmayer (1):
  libvhost-user: handle endianness as mandated by the spec

Stefan Hajnoczi (11):
  MAINTAINERS: add Stefan Hajnoczi as block/nvme.c maintainer
  util/iov: add iov_discard_undo()
  virtio-blk: undo destructive iov_discard_*() operations
  virtio-crypto: don't modify elem->in/out_sg
  docs/system: clarify deprecation schedule
  gitmodules: switch to qemu.org qboot mirror
  gitmodules: switch to qemu.org meson mirror
  gitmodules: add qemu.org vbootrom submodule
  fdmon-poll: reset npfd when upgrading to fdmon-epoll
  tests: add test-fdmon-epoll
  qemu/atomic.h: rename atomic_ to qatomic_

 MAINTAINERS                                   |   5 +-
 include/qemu/atomic.h                         | 248 +++++++++---------
 docs/devel/lockcnt.txt                        |   8 +-
 docs/devel/rcu.txt                            |  34 +--
 accel/tcg/atomic_template.h                   |  20 +-
 include/block/aio-wait.h                      |   4 +-
 include/block/aio.h                           |   8 +-
 include/exec/cpu_ldst.h                       |   2 +-
 include/exec/exec-all.h                       |   6 +-
 include/exec/log.h                            |   6 +-
 include/exec/memory.h                         |   2 +-
 include/exec/ram_addr.h                       |  26 +-
 include/exec/ramlist.h                        |   2 +-
 include/exec/tb-lookup.h                      |   4 +-
 include/hw/core/cpu.h                         |   2 +-
 include/hw/virtio/virtio-blk.h                |   2 +
 include/qemu/atomic128.h                      |   6 +-
 include/qemu/bitops.h                         |   2 +-
 include/qemu/coroutine.h                      |   2 +-
 include/qemu/iov.h                            |  23 ++
 include/qemu/log.h                            |   6 +-
 include/qemu/queue.h                          |   7 +-
 include/qemu/rcu.h                            |  10 +-
 include/qemu/rcu_queue.h                      | 100 +++----
 include/qemu/seqlock.h                        |   8 +-
 include/qemu/stats64.h                        |  28 +-
 include/qemu/thread.h                         |  24 +-
 .../infiniband/hw/vmw_pvrdma/pvrdma_ring.h    |  14 +-
 linux-user/qemu.h                             |   2 +-
 tcg/i386/tcg-target.h                         |   2 +-
 tcg/s390/tcg-target.h                         |   2 +-
 tcg/tci/tcg-target.h                          |   2 +-
 accel/kvm/kvm-all.c                           |  12 +-
 accel/tcg/cpu-exec.c                          |  15 +-
 accel/tcg/cputlb.c                            |  24 +-
 accel/tcg/tcg-all.c                           |   2 +-
 accel/tcg/translate-all.c                     |  55 ++--
 audio/jackaudio.c                             |  18 +-
 block.c                                       |   4 +-
 block/block-backend.c                         |  15 +-
 block/io.c                                    |  48 ++--
 block/nfs.c                                   |   2 +-
 block/sheepdog.c                              |   2 +-
 block/throttle-groups.c                       |  12 +-
 block/throttle.c                              |   4 +-
 blockdev.c                                    |   2 +-
 blockjob.c                                    |   2 +-
 contrib/libvhost-user/libvhost-user.c         |  79 +++---
 cpus-common.c                                 |  26 +-
 dump/dump.c                                   |   8 +-
 exec.c                                        |  49 ++--
 hw/block/virtio-blk.c                         |  11 +-
 hw/core/cpu.c                                 |   6 +-
 hw/display/qxl.c                              |   4 +-
 hw/hyperv/hyperv.c                            |  10 +-
 hw/hyperv/vmbus.c                             |   2 +-
 hw/i386/xen/xen-hvm.c                         |   2 +-
 hw/intc/rx_icu.c                              |  12 +-
 hw/intc/sifive_plic.c                         |   4 +-
 hw/misc/edu.c                                 |  16 +-
 hw/net/virtio-net.c                           |  10 +-
 hw/rdma/rdma_backend.c                        |  18 +-
 hw/rdma/rdma_rm.c                             |   2 +-
 hw/rdma/vmw/pvrdma_dev_ring.c                 |   4 +-
 hw/s390x/s390-pci-bus.c                       |   2 +-
 hw/s390x/vhost-user-fs-ccw.c                  |  75 ++++++
 hw/s390x/virtio-ccw.c                         |   2 +-
 hw/virtio/vhost.c                             |   2 +-
 hw/virtio/virtio-crypto.c                     |  17 +-
 hw/virtio/virtio-mmio.c                       |   6 +-
 hw/virtio/virtio-pci.c                        |   6 +-
 hw/virtio/virtio.c                            |  16 +-
 hw/xtensa/pic_cpu.c                           |   4 +-
 iothread.c                                    |   6 +-
 linux-user/hppa/cpu_loop.c                    |  11 +-
 linux-user/signal.c                           |   8 +-
 migration/colo-failover.c                     |   4 +-
 migration/migration.c                         |   8 +-
 migration/multifd.c                           |  18 +-
 migration/postcopy-ram.c                      |  34 +--
 migration/rdma.c                              |  34 +--
 monitor/hmp.c                                 |   6 +-
 monitor/misc.c                                |   2 +-
 monitor/monitor.c                             |   6 +-
 qemu-nbd.c                                    |   2 +-
 qga/commands.c                                |  12 +-
 qom/object.c                                  |  20 +-
 scsi/qemu-pr-helper.c                         |   4 +-
 softmmu/cpu-throttle.c                        |  10 +-
 softmmu/cpus.c                                |  42 +--
 softmmu/memory.c                              |   6 +-
 softmmu/vl.c                                  |   2 +-
 target/arm/mte_helper.c                       |   6 +-
 target/hppa/op_helper.c                       |   2 +-
 target/i386/mem_helper.c                      |   2 +-
 target/i386/whpx-all.c                        |   6 +-
 target/riscv/cpu_helper.c                     |   2 +-
 target/s390x/mem_helper.c                     |   4 +-
 target/xtensa/exc_helper.c                    |   4 +-
 target/xtensa/op_helper.c                     |   2 +-
 tcg/tcg.c                                     |  58 ++--
 tcg/tci.c                                     |   2 +-
 tests/atomic64-bench.c                        |  14 +-
 tests/atomic_add-bench.c                      |  14 +-
 tests/iothread.c                              |   2 +-
 tests/qht-bench.c                             |  12 +-
 tests/rcutorture.c                            |  24 +-
 tests/test-aio-multithread.c                  |  52 ++--
 tests/test-fdmon-epoll.c                      |  73 ++++++
 tests/test-iov.c                              | 165 ++++++++++++
 tests/test-logging.c                          |   4 +-
 tests/test-rcu-list.c                         |  38 +--
 tests/test-thread-pool.c                      |  10 +-
 util/aio-posix.c                              |  14 +-
 util/aio-wait.c                               |   2 +-
 util/aio-win32.c                              |   5 +-
 util/async.c                                  |  28 +-
 util/atomic64.c                               |  10 +-
 util/bitmap.c                                 |  14 +-
 util/cacheinfo.c                              |   2 +-
 util/fdmon-epoll.c                            |   4 +-
 util/fdmon-io_uring.c                         |  12 +-
 util/fdmon-poll.c                             |   1 +
 util/iov.c                                    |  50 +++-
 util/lockcnt.c                                |  52 ++--
 util/log.c                                    |  10 +-
 util/qemu-coroutine-lock.c                    |  18 +-
 util/qemu-coroutine-sleep.c                   |   4 +-
 util/qemu-coroutine.c                         |   6 +-
 util/qemu-sockets.c                           |   4 +-
 util/qemu-thread-posix.c                      |  12 +-
 util/qemu-thread-win32.c                      |  12 +-
 util/qemu-timer.c                             |  12 +-
 util/qht.c                                    |  57 ++--
 util/qsp.c                                    |  50 ++--
 util/rcu.c                                    |  36 +--
 util/stats64.c                                |  34 +--
 .gitmodules                                   |   6 +-
 docs/devel/atomics.rst                        | 134 +++++-----
 docs/system/deprecated.rst                    |   9 +-
 hw/s390x/meson.build                          |   1 +
 scripts/kernel-doc                            |   2 +-
 tcg/aarch64/tcg-target.c.inc                  |   2 +-
 tcg/mips/tcg-target.c.inc                     |   2 +-
 tcg/ppc/tcg-target.c.inc                      |   6 +-
 tcg/sparc/tcg-target.c.inc                    |   5 +-
 tests/meson.build                             |   3 +
 147 files changed, 1508 insertions(+), 1069 deletions(-)
 create mode 100644 hw/s390x/vhost-user-fs-ccw.c
 create mode 100644 tests/test-fdmon-epoll.c

-- 
2.26.2

Comments

no-reply@patchew.org Sept. 23, 2020, 8:28 p.m. UTC | #1
Patchew URL: https://patchew.org/QEMU/20200923161031.69474-1-stefanha@redhat.com/



Hi,

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

Type: series
Message-id: 20200923161031.69474-1-stefanha@redhat.com
Subject: [PULL 00/13] 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 ===

From https://github.com/patchew-project/qemu
 * [new tag]         patchew/20200923161031.69474-1-stefanha@redhat.com -> patchew/20200923161031.69474-1-stefanha@redhat.com
Switched to a new branch 'test'
4bf3742 qemu/atomic.h: rename atomic_ to qatomic_
8cecbb3 tests: add test-fdmon-epoll
8df4df8 fdmon-poll: reset npfd when upgrading to fdmon-epoll
825386c gitmodules: add qemu.org vbootrom submodule
5cae6f8 gitmodules: switch to qemu.org meson mirror
98349d3 gitmodules: switch to qemu.org qboot mirror
5f9d298 docs/system: clarify deprecation schedule
b431c3a virtio-crypto: don't modify elem->in/out_sg
c1f9691 virtio-blk: undo destructive iov_discard_*() operations
4182d4f util/iov: add iov_discard_undo()
a59a839 virtio: add vhost-user-fs-ccw device
0d23a8c libvhost-user: handle endianness as mandated by the spec
3167d81 MAINTAINERS: add Stefan Hajnoczi as block/nvme.c maintainer

=== OUTPUT BEGIN ===
1/13 Checking commit 3167d818e62a (MAINTAINERS: add Stefan Hajnoczi as block/nvme.c maintainer)
2/13 Checking commit 0d23a8ccd2a9 (libvhost-user: handle endianness as mandated by the spec)
WARNING: line over 80 characters
#53: FILE: contrib/libvhost-user/libvhost-user.c:548:
+        vu_panic(dev, "virtio legacy devices aren't supported by libvhost-user");

total: 0 errors, 1 warnings, 217 lines checked

Patch 2/13 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
3/13 Checking commit a59a839e1d76 (virtio: add vhost-user-fs-ccw device)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#28: 
new file mode 100644

total: 0 errors, 1 warnings, 82 lines checked

Patch 3/13 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
4/13 Checking commit 4182d4f76678 (util/iov: add iov_discard_undo())
5/13 Checking commit c1f96917a3f1 (virtio-blk: undo destructive iov_discard_*() operations)
6/13 Checking commit b431c3a4b415 (virtio-crypto: don't modify elem->in/out_sg)
7/13 Checking commit 5f9d298c71ad (docs/system: clarify deprecation schedule)
8/13 Checking commit 98349d316498 (gitmodules: switch to qemu.org qboot mirror)
9/13 Checking commit 5cae6f86bb22 (gitmodules: switch to qemu.org meson mirror)
10/13 Checking commit 825386c4f0f2 (gitmodules: add qemu.org vbootrom submodule)
11/13 Checking commit 8df4df890bf1 (fdmon-poll: reset npfd when upgrading to fdmon-epoll)
12/13 Checking commit 8cecbb39509f (tests: add test-fdmon-epoll)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#42: 
new file mode 100644

total: 0 errors, 1 warnings, 89 lines checked

Patch 12/13 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
13/13 Checking commit 4bf37426ff03 (qemu/atomic.h: rename atomic_ to qatomic_)
ERROR: Macros with multiple statements should be enclosed in a do - while loop
#2800: FILE: include/qemu/atomic.h:152:
+#define qatomic_rcu_read__nocheck(ptr, valptr)           \
+    __atomic_load(ptr, valptr, __ATOMIC_RELAXED);        \
     smp_read_barrier_depends();

ERROR: space required before that '*' (ctx:VxB)
#2945: FILE: include/qemu/atomic.h:333:
+#define qatomic_read__nocheck(p)   (*(__typeof__(*(p)) volatile*) (p))
                                                                ^

ERROR: Use of volatile is usually wrong, please add a comment
#2945: FILE: include/qemu/atomic.h:333:
+#define qatomic_read__nocheck(p)   (*(__typeof__(*(p)) volatile*) (p))

ERROR: space required before that '*' (ctx:VxB)
#2946: FILE: include/qemu/atomic.h:334:
+#define qatomic_set__nocheck(p, i) ((*(__typeof__(*(p)) volatile*) (p)) = (i))
                                                                 ^

ERROR: Use of volatile is usually wrong, please add a comment
#2946: FILE: include/qemu/atomic.h:334:
+#define qatomic_set__nocheck(p, i) ((*(__typeof__(*(p)) volatile*) (p)) = (i))

ERROR: space required after that ',' (ctx:VxV)
#2951: FILE: include/qemu/atomic.h:337:
+#define qatomic_set(ptr, i)     qatomic_set__nocheck(ptr,i)
                                                         ^

ERROR: memory barrier without comment
#3023: FILE: include/qemu/atomic.h:395:
+#define qatomic_xchg(ptr, i)    (smp_mb(), __sync_lock_test_and_set(ptr, i))

WARNING: Block comments use a leading /* on a separate line
#3097: FILE: include/qemu/atomic.h:447:
+/* qatomic_mb_read/set semantics map Java volatile variables. They are

WARNING: Block comments use a leading /* on a separate line
#6180: FILE: util/bitmap.c:214:
+        /* If we avoided the full barrier in qatomic_or(), issue a

WARNING: Block comments use a leading /* on a separate line
#7195: FILE: util/rcu.c:85:
+        /* Instead of using qatomic_mb_set for index->waiting, and

WARNING: Block comments use a leading /* on a separate line
#7221: FILE: util/rcu.c:154:
+        /* In either case, the qatomic_mb_set below blocks stores that free

total: 7 errors, 4 warnings, 6267 lines checked

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

=== OUTPUT END ===

Test command exited with code: 1


The full log is available at
http://patchew.org/logs/20200923161031.69474-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
Stefan Hajnoczi Sept. 25, 2020, 8:41 a.m. UTC | #2
On Wed, Sep 23, 2020 at 01:28:47PM -0700, no-reply@patchew.org wrote:
> Patchew URL: https://patchew.org/QEMU/20200923161031.69474-1-stefanha@redhat.com/


checkpatch is warning about pre-existing issues.

Stefan
Peter Maydell Sept. 25, 2020, 9:59 a.m. UTC | #3
On Wed, 23 Sep 2020 at 17:10, Stefan Hajnoczi <stefanha@redhat.com> wrote:
>

> The following changes since commit 0fc0142828b5bc965790a1c5c6e241897d3387cb:

>

>   Merge remote-tracking branch 'remotes/kraxel/tags/input-20200921-pull-request' into staging (2020-09-22 21:11:10 +0100)

>

> are available in the Git repository at:

>

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

>

> for you to fetch changes up to d73415a315471ac0b127ed3fad45c8ec5d711de1:

>

>   qemu/atomic.h: rename atomic_ to qatomic_ (2020-09-23 16:07:44 +0100)

>

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

> Pull request

>

> This includes the atomic_ -> qatomic_ rename that touches many files and is

> prone to conflicts.

>

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



Applied, thanks.

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

-- PMM