mbox

[PULL,00/31] Trivial patches for 2017-01-24

Message ID cover.1485250702.git.mjt@msgid.tls.msk.ru
State New
Headers show

Pull-request

git://git.corpit.ru/qemu.git tags/trivial-patches-fetch

Message

Michael Tokarev Jan. 24, 2017, 9:39 a.m. UTC
Hi!
This is a next trivial-patches pull request after a long while.
We had a new release (2.8), new year holidays and other stuff.
So here we go now with whatever has been collected so far.

Please consider applying.

Thanks,

/mjt

The following changes since commit 3879284d6517dc22529395bdb259f4183b589127:

  Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-2017-01-23-2' into staging (2017-01-23 15:59:09 +0000)

are available in the git repository at:

  git://git.corpit.ru/qemu.git tags/trivial-patches-fetch

for you to fetch changes up to bed534dd4032446750ad3e7a806c24d81bc5851b:

  hw/isa/isa-bus: Set category of the "isabus-bridge" device (2017-01-24 12:38:03 +0300)

----------------------------------------------------------------
trivial patches for 2017-01-24

----------------------------------------------------------------
Cao jin (5):
      pcie: fix typo in comments
      doc/usb2: fix typo
      vfio: remove a duplicated word in comments
      util/mmap-alloc: check parameter before using
      util/mmap-alloc: refactor a little bit for readability

Frediano Ziglio (1):
      usb: Fix typo in documentation

Gerd Hoffmann (1):
      docs: sync pci-ids.txt

Marc-André Lureau (3):
      object.h: spelling fix
      object: make some funcs static
      win32: use glib gpoll if glib >= 2.50

Michael Tokarev (1):
      doc: don't mention -memory, it is -m

Paolo Bonzini (4):
      qemu-img: remove dead check
      pci-assign: avoid pointless stat
      block: remove dead check
      qga: fix erroneous argument to strerror

Peter Maydell (6):
      README: Add linux to macOS build info
      hw/i386/kvmvapic: Remove dead code in patch_hypercalls()
      lm32: milkymist-tmu2: fix another integer overflow
      disas/cris.c: Fix Coverity warning about unchecked NULL
      hw/display/framebuffer.c: Avoid overflow for framebuffers > 4GB
      scsi-disk: add 'fall through' comment to switch VERIFY cases

Po-Hsu Lin (1):
      qemu-options: cleanup duplicated help message for kernel_irqchip

Samuel Thibault (1):
      Drop duplicate display option documentation

Stefan Weil (4):
      hw/block/m25p80: Fix typo in local macro name
      Fix documentation and some comments (article, grammar)
      include: Fix typos found by codespell
      hw: Fix typos found by codespell

Thomas Huth (2):
      usb: Set category and description of the MTP device
      hw/isa/isa-bus: Set category of the "isabus-bridge" device

Ziyue Yang (2):
      gdbstub.c: fix GDB connection segfault caused by empty machines
      gdbstub.c: update old error report statements

 README                         |  1 +
 arch_init.c                    |  2 +-
 block.c                        |  2 +-
 disas/cris.c                   |  2 +-
 docs/specs/pci-ids.txt         |  3 +++
 docs/usb-storage.txt           |  2 +-
 docs/usb2.txt                  |  2 +-
 gdbstub.c                      | 17 ++++++++++++-----
 hw/block/m25p80.c              |  4 ++--
 hw/core/generic-loader.c       |  4 ++--
 hw/core/qdev-properties.c      |  2 +-
 hw/display/framebuffer.c       |  2 +-
 hw/display/milkymist-tmu2.c    |  2 +-
 hw/display/xlnx_dp.c           |  4 ++--
 hw/i386/kvmvapic.c             |  6 ------
 hw/i386/pc.c                   |  2 +-
 hw/i386/pci-assign-load-rom.c  | 16 ++++++++--------
 hw/isa/isa-bus.c               |  1 +
 hw/net/cadence_gem.c           |  2 +-
 hw/net/spapr_llan.c            |  4 ++--
 hw/pci/pcie.c                  |  2 +-
 hw/ppc/spapr_drc.c             |  2 +-
 hw/s390x/s390-pci-bus.h        |  4 ++--
 hw/scsi/scsi-disk.c            |  1 +
 hw/usb/dev-mtp.c               |  4 +++-
 hw/vfio/pci-quirks.c           |  2 +-
 hw/vfio/pci.c                  |  4 ++--
 hw/virtio/virtio-crypto.c      |  2 +-
 include/glib-compat.h          |  2 +-
 include/hw/dma/xlnx_dpdma.h    |  3 ++-
 include/hw/pci-host/q35.h      |  2 +-
 include/hw/register.h          |  2 +-
 include/qapi/dealloc-visitor.h |  2 +-
 include/qemu/qht.h             |  2 +-
 include/qemu/xattr.h           |  2 +-
 include/qom/object.h           | 26 +-------------------------
 qemu-doc.texi                  |  2 +-
 qemu-img.c                     | 12 +++++-------
 qemu-options.hx                |  7 +++----
 qga/main.c                     |  4 ++--
 qom/object.c                   |  4 ++--
 util/mmap-alloc.c              | 17 ++++++++---------
 util/oslib-win32.c             |  2 ++
 util/uri.c                     |  4 ++--
 44 files changed, 89 insertions(+), 105 deletions(-)

Comments

no-reply@patchew.org Jan. 24, 2017, 1:20 p.m. UTC | #1
Hi,

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

Type: series
Subject: [Qemu-devel] [PULL 00/31] Trivial patches for 2017-01-24
Message-id: cover.1485250702.git.mjt@msgid.tls.msk.ru

=== TEST SCRIPT BEGIN ===
#!/bin/bash

BASE=base
n=1
total=$(git log --oneline $BASE.. | wc -l)
failed=0

# Useful git options
git config --local diff.renamelimit 0
git config --local diff.renames True

commits="$(git log --format=%H --reverse $BASE..)"
for c in $commits; do
    echo "Checking PATCH $n/$total: $(git log -n 1 --format=%s $c)..."
    if ! git show $c --format=email | ./scripts/checkpatch.pl --mailback -; then
        failed=1
        echo
    fi
    n=$((n+1))
done

exit $failed
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
 - [tag update]      patchew/20170120170757.30308-1-pbonzini@redhat.com -> patchew/20170120170757.30308-1-pbonzini@redhat.com
 * [new tag]         patchew/cover.1485250702.git.mjt@msgid.tls.msk.ru -> patchew/cover.1485250702.git.mjt@msgid.tls.msk.ru
Switched to a new branch 'test'
94bb476 hw/isa/isa-bus: Set category of the "isabus-bridge" device
e7d0e41 usb: Set category and description of the MTP device
4c465ee gdbstub.c: update old error report statements
c7934c0 gdbstub.c: fix GDB connection segfault caused by empty machines
5973265 scsi-disk: add 'fall through' comment to switch VERIFY cases
2f7b73f Drop duplicate display option documentation
0ce574a hw/display/framebuffer.c: Avoid overflow for framebuffers > 4GB
8ee8627 win32: use glib gpoll if glib >= 2.50
6084491 util/mmap-alloc: refactor a little bit for readability
4ab9130 util/mmap-alloc: check parameter before using
7bb7f65 vfio: remove a duplicated word in comments
8142fa9 docs: sync pci-ids.txt
2f81e84 disas/cris.c: Fix Coverity warning about unchecked NULL
acba3b6 lm32: milkymist-tmu2: fix another integer overflow
8b56899 hw/i386/kvmvapic: Remove dead code in patch_hypercalls()
ac3df10 doc/usb2: fix typo
779d645 qga: fix erroneous argument to strerror
e9d6f80 block: remove dead check
97299b2 pci-assign: avoid pointless stat
c80903c qemu-img: remove dead check
6775cb9 pcie: fix typo in comments
38199c9 object: make some funcs static
0bbf843 object.h: spelling fix
9d6919e usb: Fix typo in documentation
b9c8a56 qemu-options: cleanup duplicated help message for kernel_irqchip
cea65b0 hw: Fix typos found by codespell
92b9a20 include: Fix typos found by codespell
24ba6aa Fix documentation and some comments (article, grammar)
cdab148 README: Add linux to macOS build info
f8dea8b hw/block/m25p80: Fix typo in local macro name
3fcd102 doc: don't mention -memory, it is -m

=== OUTPUT BEGIN ===
Checking PATCH 1/31: doc: don't mention -memory, it is -m...
Checking PATCH 2/31: hw/block/m25p80: Fix typo in local macro name...
Checking PATCH 3/31: README: Add linux to macOS build info...
Checking PATCH 4/31: Fix documentation and some comments (article, grammar)...
Checking PATCH 5/31: include: Fix typos found by codespell...
Checking PATCH 6/31: hw: Fix typos found by codespell...
WARNING: line over 80 characters
#112: FILE: hw/net/spapr_llan.c:562:
+         * pools before, but changed the size of one pool in the meantime, we might

total: 0 errors, 1 warnings, 114 lines checked

Your patch has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
Checking PATCH 7/31: qemu-options: cleanup duplicated help message for kernel_irqchip...
Checking PATCH 8/31: usb: Fix typo in documentation...
Checking PATCH 9/31: object.h: spelling fix...
Checking PATCH 10/31: object: make some funcs static...
Checking PATCH 11/31: pcie: fix typo in comments...
Checking PATCH 12/31: qemu-img: remove dead check...
Checking PATCH 13/31: pci-assign: avoid pointless stat...
WARNING: line over 80 characters
#34: FILE: hw/i386/pci-assign-load-rom.c:46:
+            error_report("pci-assign: Cannot open %s: %s", rom_file, strerror(errno));

WARNING: line over 80 characters
#39: FILE: hw/i386/pci-assign-load-rom.c:51:
+        error_report("pci-assign: Cannot stat %s: %s", rom_file, strerror(errno));

total: 0 errors, 2 warnings, 27 lines checked

Your patch has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
Checking PATCH 14/31: block: remove dead check...
Checking PATCH 15/31: qga: fix erroneous argument to strerror...
Checking PATCH 16/31: doc/usb2: fix typo...
Checking PATCH 17/31: hw/i386/kvmvapic: Remove dead code in patch_hypercalls()...
Checking PATCH 18/31: lm32: milkymist-tmu2: fix another integer overflow...
Checking PATCH 19/31: disas/cris.c: Fix Coverity warning about unchecked NULL...
ERROR: code indent should never use tabs
#26: FILE: disas/cris.c:2493:
+^Iif (sregp == NULL || sregp->name == NULL)$

ERROR: suspect code indent for conditional statements (8, 10)
#26: FILE: disas/cris.c:2493:
+	if (sregp == NULL || sregp->name == NULL)
 	  /* Should have been caught as a non-match earlier.  */

ERROR: braces {} are necessary for all arms of this statement
#26: FILE: disas/cris.c:2493:
+	if (sregp == NULL || sregp->name == NULL)
[...]

total: 3 errors, 0 warnings, 8 lines checked

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

Checking PATCH 20/31: docs: sync pci-ids.txt...
Checking PATCH 21/31: vfio: remove a duplicated word in comments...
Checking PATCH 22/31: util/mmap-alloc: check parameter before using...
Checking PATCH 23/31: util/mmap-alloc: refactor a little bit for readability...
Checking PATCH 24/31: win32: use glib gpoll if glib >= 2.50...
Checking PATCH 25/31: hw/display/framebuffer.c: Avoid overflow for framebuffers > 4GB...
Checking PATCH 26/31: Drop duplicate display option documentation...
Checking PATCH 27/31: scsi-disk: add 'fall through' comment to switch VERIFY cases...
Checking PATCH 28/31: gdbstub.c: fix GDB connection segfault caused by empty machines...
Checking PATCH 29/31: gdbstub.c: update old error report statements...
Checking PATCH 30/31: usb: Set category and description of the MTP device...
Checking PATCH 31/31: hw/isa/isa-bus: Set category of the "isabus-bridge" device...
=== OUTPUT END ===

Test command exited with code: 1


---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@freelists.org
Peter Maydell Jan. 24, 2017, 4:55 p.m. UTC | #2
On 24 January 2017 at 09:39, Michael Tokarev <mjt@tls.msk.ru> wrote:
> Hi!
> This is a next trivial-patches pull request after a long while.
> We had a new release (2.8), new year holidays and other stuff.
> So here we go now with whatever has been collected so far.
>
> Please consider applying.
>
> Thanks,
>
> /mjt
>
> The following changes since commit 3879284d6517dc22529395bdb259f4183b589127:
>
>   Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-2017-01-23-2' into staging (2017-01-23 15:59:09 +0000)
>
> are available in the git repository at:
>
>   git://git.corpit.ru/qemu.git tags/trivial-patches-fetch
>
> for you to fetch changes up to bed534dd4032446750ad3e7a806c24d81bc5851b:
>
>   hw/isa/isa-bus: Set category of the "isabus-bridge" device (2017-01-24 12:38:03 +0300)
>
> ----------------------------------------------------------------
> trivial patches for 2017-01-24
>

Applied, thanks.

-- PMM
Peter Maydell Jan. 24, 2017, 4:56 p.m. UTC | #3
On 24 January 2017 at 16:55, Peter Maydell <peter.maydell@linaro.org> wrote:
> On 24 January 2017 at 09:39, Michael Tokarev <mjt@tls.msk.ru> wrote:
>> Hi!
>> This is a next trivial-patches pull request after a long while.
>> We had a new release (2.8), new year holidays and other stuff.
>> So here we go now with whatever has been collected so far.
>>
>> Please consider applying.
>>
>> Thanks,
>>
>> /mjt
>>
>> The following changes since commit 3879284d6517dc22529395bdb259f4183b589127:
>>
>>   Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-2017-01-23-2' into staging (2017-01-23 15:59:09 +0000)
>>
>> are available in the git repository at:
>>
>>   git://git.corpit.ru/qemu.git tags/trivial-patches-fetch
>>
>> for you to fetch changes up to bed534dd4032446750ad3e7a806c24d81bc5851b:
>>
>>   hw/isa/isa-bus: Set category of the "isabus-bridge" device (2017-01-24 12:38:03 +0300)
>>
>> ----------------------------------------------------------------
>> trivial patches for 2017-01-24
>>
>
> Applied, thanks.

whoops, replied to wrong mail. This one's still processing.

thanks
-- PMM
Peter Maydell Jan. 24, 2017, 5:26 p.m. UTC | #4
On 24 January 2017 at 09:39, Michael Tokarev <mjt@tls.msk.ru> wrote:
> Hi!
> This is a next trivial-patches pull request after a long while.
> We had a new release (2.8), new year holidays and other stuff.
> So here we go now with whatever has been collected so far.
>
> Please consider applying.
>
> Thanks,
>
> /mjt
>
> The following changes since commit 3879284d6517dc22529395bdb259f4183b589127:
>
>   Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-2017-01-23-2' into staging (2017-01-23 15:59:09 +0000)
>
> are available in the git repository at:
>
>   git://git.corpit.ru/qemu.git tags/trivial-patches-fetch
>
> for you to fetch changes up to bed534dd4032446750ad3e7a806c24d81bc5851b:
>
>   hw/isa/isa-bus: Set category of the "isabus-bridge" device (2017-01-24 12:38:03 +0300)
>
> ----------------------------------------------------------------
> trivial patches for 2017-01-24
>
> ----------------------------------------------------------------

This failed to build, all targets:

/home/petmay01/linaro/qemu-for-merges/arch_init.c:95:5: error: no
previous prototype for ‘qemu_read_default_config_files’
[-Werror=missing-prototypes]

I suspect this may be the result of merge conflicts getting
wrongly resolved -- can you rebase and resend, please?

thanks
-- PMM