mbox

[PULL,00/19] Bugfix/cleanup patches for 2019-07-16

Message ID 1563264677-39718-1-git-send-email-pbonzini@redhat.com (mailing list archive)
State New, archived
Headers show

Pull-request

git://github.com/bonzini/qemu.git tags/for-upstream

Message

Paolo Bonzini July 16, 2019, 8:10 a.m. UTC
The following changes since commit 46cd24e7ed38191b5ab5c40a836d6c5b6b604f8a:

  Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2019-07-12 17:34:13 +0100)

are available in the git repository at:


  git://github.com/bonzini/qemu.git tags/for-upstream

for you to fetch changes up to 45d8bc3adedeceaf449d758aee1810bfbe6feff4:

  vl: make sure char-pty message displayed by moving setbuf to the beginning (2019-07-16 09:27:16 +0200)

----------------------------------------------------------------
* VFIO bugfix for AMD SEV (Alex)
* Kconfig improvements (Julio, Philippe)
* MemoryRegion reference counting bugfix (King Wang)
* Build system cleanups (Marc-André, myself)
* rdmacm-mux off-by-one (Marc-André)
* ZBC passthrough fixes (Shinichiro, myself)
* WHPX build fix (Stefan)
* char-pty fix (Wei Yang)

----------------------------------------------------------------
Alex Williamson (1):
      target/i386: sev: Do not unpin ram device memory region

Julio Montes (1):
      hw/i386: turn off vmport if CONFIG_VMPORT is disabled

King Wang (1):
      memory: unref the memory region in simplify flatview

Marc-André Lureau (2):
      build-sys: remove slirp cflags from main-loop.o
      rdmacm-mux: fix strcpy string warning

Paolo Bonzini (8):
      scsi: explicitly list guest-recoverable sense codes
      scsi: add guest-recoverable ZBC errors
      iscsi: fix busy/timeout/task set full
      iscsi: base all handling of check condition on scsi_sense_to_errno
      util: merge main-loop.c and iohandler.c
      checkpatch: detect doubly-encoded UTF-8
      Makefile: do not repeat $(CONFIG_SOFTMMU) in hw/Makefile.objs
      create_config: remove $(CONFIG_SOFTMMU) hack

Philippe Mathieu-Daudé (3):
      hw/lm32/Kconfig: Milkymist One provides a USB 1.1 Controller
      hw/usb/Kconfig: Add CONFIG_USB_EHCI_PCI
      hw/usb/Kconfig: USB_XHCI_NEC requires USB_XHCI

Shinichiro Kawasaki (1):
      scsi-disk: pass sense correctly for guest-recoverable errors

Stefan Weil (1):
      Fix broken build with WHPX enabled

Wei Yang (1):
      vl: make sure char-pty message displayed by moving setbuf to the beginning

 block/iscsi.c             |  29 +++++-----
 configure                 |   2 +-
 contrib/rdmacm-mux/main.c |   2 +-
 hw/Makefile.objs          |  61 +++++++++++----------
 hw/i386/Kconfig           |   4 +-
 hw/i386/pc.c              |   5 ++
 hw/lm32/Kconfig           |   1 +
 hw/scsi/scsi-disk.c       |  15 ++++--
 hw/usb/Kconfig            |  11 ++--
 hw/usb/Makefile.objs      |   5 +-
 include/scsi/utils.h      |   1 +
 memory.c                  |   5 +-
 scripts/checkpatch.pl     |  16 ++++++
 scripts/create_config     |   2 +-
 scsi/utils.c              |  53 ++++++++++++++++--
 target/i386/sev.c         |  11 ++++
 target/i386/whpx-all.c    |   4 +-
 util/Makefile.objs        |   3 +-
 util/iohandler.c          | 135 ----------------------------------------------
 util/main-loop.c          | 110 +++++++++++++++++++++++++++++++++++++
 vl.c                      |   4 +-
 21 files changed, 276 insertions(+), 203 deletions(-)
 delete mode 100644 util/iohandler.c

Comments

no-reply@patchew.org July 16, 2019, 8:18 a.m. UTC | #1
Patchew URL: https://patchew.org/QEMU/1563264677-39718-1-git-send-email-pbonzini@redhat.com/



Hi,

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

Subject: [Qemu-devel] [PULL 00/19] Bugfix/cleanup patches for 2019-07-16
Type: series
Message-id: 1563264677-39718-1-git-send-email-pbonzini@redhat.com

=== 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/1563264677-39718-1-git-send-email-pbonzini@redhat.com -> patchew/1563264677-39718-1-git-send-email-pbonzini@redhat.com
Switched to a new branch 'test'
db7c8bd vl: make sure char-pty message displayed by moving setbuf to the beginning
8f48c9a create_config: remove $(CONFIG_SOFTMMU) hack
ca11419 Makefile: do not repeat $(CONFIG_SOFTMMU) in hw/Makefile.objs
0131f11 hw/usb/Kconfig: USB_XHCI_NEC requires USB_XHCI
fd8977c hw/usb/Kconfig: Add CONFIG_USB_EHCI_PCI
1c7aad6 target/i386: sev: Do not unpin ram device memory region
6e17e8f checkpatch: detect doubly-encoded UTF-8
df73f94 hw/lm32/Kconfig: Milkymist One provides a USB 1.1 Controller
0538f34 util: merge main-loop.c and iohandler.c
8112363 Fix broken build with WHPX enabled
9ac7907 memory: unref the memory region in simplify flatview
15913c5 hw/i386: turn off vmport if CONFIG_VMPORT is disabled
e97ff84 rdmacm-mux: fix strcpy string warning
41bec64 build-sys: remove slirp cflags from main-loop.o
bf28a5e iscsi: base all handling of check condition on scsi_sense_to_errno
ed55acf iscsi: fix busy/timeout/task set full
378b9f0 scsi: add guest-recoverable ZBC errors
0e2ded1 scsi: explicitly list guest-recoverable sense codes
6aaa445 scsi-disk: pass sense correctly for guest-recoverable errors

=== OUTPUT BEGIN ===
1/19 Checking commit 6aaa44542e0a (scsi-disk: pass sense correctly for guest-recoverable errors)
2/19 Checking commit 0e2ded152b3a (scsi: explicitly list guest-recoverable sense codes)
WARNING: line over 80 characters
#27: FILE: hw/scsi/scsi-disk.c:457:
+            if (scsi_sense_buf_is_guest_recoverable(r->req.sense, sizeof(r->req.sense))) {

WARNING: line over 80 characters
#45: FILE: include/scsi/utils.h:109:
+bool scsi_sense_buf_is_guest_recoverable(const uint8_t *sense, size_t sense_size);

total: 0 errors, 2 warnings, 78 lines checked

Patch 2/19 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
3/19 Checking commit 378b9f03db84 (scsi: add guest-recoverable ZBC errors)
4/19 Checking commit ed55acfce974 (iscsi: fix busy/timeout/task set full)
5/19 Checking commit bf28a5e8685d (iscsi: base all handling of check condition on scsi_sense_to_errno)
ERROR: return of an errno should typically be -ve (return -EAGAIN)
#88: FILE: scsi/utils.c:382:
+        return EAGAIN;

ERROR: return of an errno should typically be -ve (return -EINPROGRESS)
#97: FILE: scsi/utils.c:411:
+        return EINPROGRESS;

total: 2 errors, 0 warnings, 74 lines checked

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

6/19 Checking commit 41bec64cc2c7 (build-sys: remove slirp cflags from main-loop.o)
7/19 Checking commit e97ff84ebcfc (rdmacm-mux: fix strcpy string warning)
8/19 Checking commit 15913c50a392 (hw/i386: turn off vmport if CONFIG_VMPORT is disabled)
9/19 Checking commit 9ac79075636c (memory: unref the memory region in simplify flatview)
10/19 Checking commit 8112363187e0 (Fix broken build with WHPX enabled)
11/19 Checking commit 0538f34bd405 (util: merge main-loop.c and iohandler.c)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#32: 
deleted file mode 100644

WARNING: Block comments use a leading /* on a separate line
#237: FILE: util/main-loop.c:578:
+/* reaping of zombies.  right now we're not passing the status to

WARNING: Block comments use * on subsequent lines
#238: FILE: util/main-loop.c:579:
+/* reaping of zombies.  right now we're not passing the status to
+   anyone, but it would be possible to add a callback.  */

WARNING: Block comments use a trailing */ on a separate line
#238: FILE: util/main-loop.c:579:
+   anyone, but it would be possible to add a callback.  */

total: 0 errors, 4 warnings, 127 lines checked

Patch 11/19 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
12/19 Checking commit df73f94a7149 (hw/lm32/Kconfig: Milkymist One provides a USB 1.1 Controller)
13/19 Checking commit 6e17e8f7434a (checkpatch: detect doubly-encoded UTF-8)
WARNING: line over 80 characters
#35: FILE: scripts/checkpatch.pl:271:
+       | \xC3[\xA1-\xAC\xAE\xAF] (?: \xC2[\x80-\xBF]){2}  # e1-ec/ee/ef 80-bf 80-bf

WARNING: line over 80 characters
#37: FILE: scripts/checkpatch.pl:273:
+       | \xC3\xB0 \xC2[\x90-\xBF] (?: \xC2[\x80-\xBF]){2} # f0 90-bf 80-bf 80-bf

WARNING: line over 80 characters
#38: FILE: scripts/checkpatch.pl:274:
+       | \xC3[\xB1-\xB3] (?: \xC2[\x80-\xBF]){3}          # f1-f3 80-bf 80-bf 80-bf

WARNING: line over 80 characters
#39: FILE: scripts/checkpatch.pl:275:
+       | \xC3\xB4 \xC2[\x80-\x8F] (?: \xC2[\x80-\xBF]){2} # f4 80-b8 80-bf 80-bf

total: 0 errors, 4 warnings, 28 lines checked

Patch 13/19 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
14/19 Checking commit 1c7aad662155 (target/i386: sev: Do not unpin ram device memory region)
15/19 Checking commit fd8977ce486f (hw/usb/Kconfig: Add CONFIG_USB_EHCI_PCI)
16/19 Checking commit 0131f1107c96 (hw/usb/Kconfig: USB_XHCI_NEC requires USB_XHCI)
17/19 Checking commit ca1141992871 (Makefile: do not repeat $(CONFIG_SOFTMMU) in hw/Makefile.objs)
18/19 Checking commit 8f48c9a92462 (create_config: remove $(CONFIG_SOFTMMU) hack)
19/19 Checking commit db7c8bd2b12b (vl: make sure char-pty message displayed by moving setbuf to the beginning)
=== OUTPUT END ===

Test command exited with code: 1


The full log is available at
http://patchew.org/logs/1563264677-39718-1-git-send-email-pbonzini@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 July 16, 2019, 3:05 p.m. UTC | #2
On Tue, 16 Jul 2019 at 09:11, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> The following changes since commit 46cd24e7ed38191b5ab5c40a836d6c5b6b604f8a:
>
>   Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2019-07-12 17:34:13 +0100)
>
> are available in the git repository at:
>
>
>   git://github.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to 45d8bc3adedeceaf449d758aee1810bfbe6feff4:
>
>   vl: make sure char-pty message displayed by moving setbuf to the beginning (2019-07-16 09:27:16 +0200)
>
> ----------------------------------------------------------------
> * VFIO bugfix for AMD SEV (Alex)
> * Kconfig improvements (Julio, Philippe)
> * MemoryRegion reference counting bugfix (King Wang)
> * Build system cleanups (Marc-André, myself)
> * rdmacm-mux off-by-one (Marc-André)
> * ZBC passthrough fixes (Shinichiro, myself)
> * WHPX build fix (Stefan)
> * char-pty fix (Wei Yang)
>
> ----------------------------------------------------------------


Applied, thanks.

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

-- PMM
Peter Maydell July 19, 2019, 4:15 p.m. UTC | #3
On Tue, 16 Jul 2019 at 09:11, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> The following changes since commit 46cd24e7ed38191b5ab5c40a836d6c5b6b604f8a:
>
>   Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2019-07-12 17:34:13 +0100)
>
> are available in the git repository at:
>
>
>   git://github.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to 45d8bc3adedeceaf449d758aee1810bfbe6feff4:
>
>   vl: make sure char-pty message displayed by moving setbuf to the beginning (2019-07-16 09:27:16 +0200)
>
> ----------------------------------------------------------------
> * VFIO bugfix for AMD SEV (Alex)
> * Kconfig improvements (Julio, Philippe)
> * MemoryRegion reference counting bugfix (King Wang)
> * Build system cleanups (Marc-André, myself)
> * rdmacm-mux off-by-one (Marc-André)
> * ZBC passthrough fixes (Shinichiro, myself)
> * WHPX build fix (Stefan)
> * char-pty fix (Wei Yang)

Hi Paolo -- it looks like this may have broken the
travis config "--without-default-devices":

Here's a sample failing build:
https://travis-ci.org/qemu/qemu/jobs/559509325

minikconf barfs with "contradiction between clauses"

Traceback (most recent call last):
  File "/home/travis/build/qemu/qemu/scripts/minikconf.py", line 703,
in <module>
    config = data.compute_config()
  File "/home/travis/build/qemu/qemu/scripts/minikconf.py", line 253,
in compute_config
    clause.process()
  File "/home/travis/build/qemu/qemu/scripts/minikconf.py", line 188, in process
    self.dest.set_value(False, self)
  File "/home/travis/build/qemu/qemu/scripts/minikconf.py", line 118,
in set_value
    raise KconfigDataError('contradiction between clauses when setting
%s' % self)
__main__.KconfigDataError: contradiction between clauses when setting VMMOUSE


I guess this is Julio's commit 97fd1ea8c10658?

thanks
-- PMM
Paolo Bonzini July 19, 2019, 5 p.m. UTC | #4
On 19/07/19 18:15, Peter Maydell wrote:
> Hi Paolo -- it looks like this may have broken the
> travis config "--without-default-devices":

Alex Bennée already has a queued patch for this (and I did too but I
removed it in favor of his).  You can apply it directly from message-id
<20190717134335.15351-18-alex.bennee@linaro.org>.

Paolo

> Here's a sample failing build:
> https://travis-ci.org/qemu/qemu/jobs/559509325
> 
> minikconf barfs with "contradiction between clauses"
> 
> Traceback (most recent call last):
>   File "/home/travis/build/qemu/qemu/scripts/minikconf.py", line 703,
> in <module>
>     config = data.compute_config()
>   File "/home/travis/build/qemu/qemu/scripts/minikconf.py", line 253,
> in compute_config
>     clause.process()
>   File "/home/travis/build/qemu/qemu/scripts/minikconf.py", line 188, in process
>     self.dest.set_value(False, self)
>   File "/home/travis/build/qemu/qemu/scripts/minikconf.py", line 118,
> in set_value
>     raise KconfigDataError('contradiction between clauses when setting
> %s' % self)
> __main__.KconfigDataError: contradiction between clauses when setting VMMOUSE
> 
> 
> I guess this is Julio's commit 97fd1ea8c10658?
> 
> thanks
> -- PMM
>