mbox

[PULL,00/31] Misc patches for 2020-01-21

Message ID 20210123143128.1167797-1-pbonzini@redhat.com (mailing list archive)
State New, archived
Headers show

Pull-request

https://gitlab.com/bonzini/qemu.git tags/for-upstream

Message

Paolo Bonzini Jan. 23, 2021, 2:30 p.m. UTC
The following changes since commit fef80ea073c4862bc9eaddb6ddb0ed970b8ad7c4:

  Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2021-01-20' into staging (2021-01-21 10:44:28 +0000)

are available in the Git repository at:

  https://gitlab.com/bonzini/qemu.git tags/for-upstream

for you to fetch changes up to fc70d67e73e9cba950cf9d16281a78eb4ab6e4ce:

  qemu-option: warn for short-form boolean options (2021-01-23 09:29:42 -0500)

----------------------------------------------------------------
* Make MinGW respect --bindir (Joshua)
* Switch MinGW to a "deep" installation (Joshua + NSIS fixes by myself)
* Fix compilation errors/warnings (Qixin, Philippe)
* Switch slirp to a subproject (Marc-André)
* QemuOpts cleanups (myself)
* Consistency improvements for -action (myself)
* remove deprecated "change vnc TARGET" functionality (myself)
* meson cleanups (Philippe, myself)
* IDE out-of-bounds access (Prasad)
* LA57 fix for -cpu max (Weijiang)

----------------------------------------------------------------
Gan Qixin (1):
      util/cacheflush: Fix error generated by clang

Joshua Watt (1):
      configure: MinGW respect --bindir argument

Marc-André Lureau (4):
      build-sys: remove unused LIBS
      build-sys: set global arguments for cflags/ldflags
      build-sys: add libvhost-user missing dependencies
      slirp: update to git master

Paolo Bonzini (11):
      runstate: cleanup reboot and panic actions
      build-system: clean up TCG/TCI configury
      nsis: adjust for new MinGW paths
      meson: convert wixl detection to Meson
      acceptance: switch to QMP change-vnc-password command
      hmp: remove "change vnc TARGET" command
      qmp: remove deprecated "change" command
      vnc: support "-vnc help"
      qemu-option: clean up id vs. list->merge_lists
      qemu-option: move help handling to get_opt_name_value
      qemu-option: warn for short-form boolean options

Philippe Mathieu-Daudé (12):
      softmmu/physmem: Silence GCC 10 maybe-uninitialized error
      meson: Declare have_virtfs_proxy_helper in main meson.build
      meson: Summarize information related to directories first
      meson: Display host binaries information altogether
      meson: Summarize overall features altogether
      meson: Summarize compilation-related information altogether
      meson: Display accelerators and selected targets altogether
      meson: Display block layer information altogether
      meson: Display crypto-related information altogether
      meson: Add a section header for library dependencies
      meson.build: Declare global edk2_targets / install_edk2_blobs variables
      meson.build: Detect bzip2 program

Prasad J Pandit (1):
      ide: atapi: check logical block address and read size (CVE-2020-29443)

Yang Weijiang (1):
      x86/cpu: Use max host physical address if -cpu max option is applied

 .gitmodules                           |   6 +-
 Makefile                              |   2 -
 configure                             | 146 +++---------
 disas/meson.build                     |   2 -
 docs/system/deprecated.rst            |  11 +-
 docs/system/removed-features.rst      |  11 +
 fsdev/meson.build                     |   1 -
 hmp-commands.hx                       |   6 -
 hw/ide/atapi.c                        |  30 ++-
 include/ui/console.h                  |   2 +-
 meson.build                           | 408 +++++++++++++++++-----------------
 meson_options.txt                     |   4 +
 monitor/hmp-cmds.c                    |   7 +-
 monitor/qmp-cmds.c                    |  51 -----
 pc-bios/descriptors/meson.build       |  30 +--
 pc-bios/meson.build                   |   6 +-
 qapi/misc.json                        |  49 ----
 qapi/run-state.json                   |  10 +-
 qemu-options.hx                       |   8 +-
 qemu.nsi                              |  42 +---
 qga/meson.build                       |  55 +++--
 slirp                                 |   1 -
 softmmu/physmem.c                     |   2 +-
 softmmu/runstate-action.c             |   4 +-
 softmmu/runstate.c                    |   7 +-
 softmmu/vl.c                          |   8 +-
 subprojects/libslirp                  |   1 +
 subprojects/libvhost-user/meson.build |   3 +
 target/i386/cpu.c                     |   1 +
 tests/acceptance/vnc.py               |  18 +-
 tests/test-qemu-opts.c                |   2 +-
 ui/vnc-stubs.c                        |   7 +-
 ui/vnc.c                              |   8 +-
 util/cacheflush.c                     |   8 +-
 util/qemu-option.c                    |  86 ++++---
 35 files changed, 442 insertions(+), 601 deletions(-)
 delete mode 160000 slirp
 create mode 160000 subprojects/libslirp

Comments

no-reply@patchew.org Jan. 23, 2021, 2:57 p.m. UTC | #1
Patchew URL: https://patchew.org/QEMU/20210123143128.1167797-1-pbonzini@redhat.com/



Hi,

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

Type: series
Message-id: 20210123143128.1167797-1-pbonzini@redhat.com
Subject: [PULL 00/31] Misc patches for 2020-01-21

=== 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/20210123143128.1167797-1-pbonzini@redhat.com -> patchew/20210123143128.1167797-1-pbonzini@redhat.com
Switched to a new branch 'test'
4a3ceb3 qemu-option: warn for short-form boolean options
601145b qemu-option: move help handling to get_opt_name_value
d44f2ed qemu-option: clean up id vs. list->merge_lists
d70fb5f vnc: support "-vnc help"
fe666fb qmp: remove deprecated "change" command
8581d24 hmp: remove "change vnc TARGET" command
e784bbe acceptance: switch to QMP change-vnc-password command
82574e9 meson.build: Detect bzip2 program
cc91009 meson.build: Declare global edk2_targets / install_edk2_blobs variables
a8e31f6 meson: Add a section header for library dependencies
88a07a2 meson: Display crypto-related information altogether
0e8b853 meson: Display block layer information altogether
6336d44 meson: Display accelerators and selected targets altogether
b332b01 meson: Summarize compilation-related information altogether
b807fd5 meson: Summarize overall features altogether
bfb3d06 meson: Display host binaries information altogether
86dcc24 meson: Summarize information related to directories first
f678a10 meson: convert wixl detection to Meson
f464b38 nsis: adjust for new MinGW paths
e7b75e0 meson: Declare have_virtfs_proxy_helper in main meson.build
a1e89ed slirp: update to git master
13a0c33 build-sys: add libvhost-user missing dependencies
51e6567 build-sys: set global arguments for cflags/ldflags
8922c06 build-sys: remove unused LIBS
08be6c9 ide: atapi: check logical block address and read size (CVE-2020-29443)
6f15f3c softmmu/physmem: Silence GCC 10 maybe-uninitialized error
201c7af util/cacheflush: Fix error generated by clang
c6ae035 build-system: clean up TCG/TCI configury
b981bdd x86/cpu: Use max host physical address if -cpu max option is applied
8c3b2ab configure: MinGW respect --bindir argument
35af975 runstate: cleanup reboot and panic actions

=== OUTPUT BEGIN ===
1/31 Checking commit 35af975eb80f (runstate: cleanup reboot and panic actions)
ERROR: line over 90 characters
#118: FILE: softmmu/runstate.c:478:
+        || (panic_action == PANIC_ACTION_SHUTDOWN && shutdown_action == SHUTDOWN_ACTION_PAUSE)) {

total: 1 errors, 0 warnings, 83 lines checked

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

2/31 Checking commit 8c3b2ab803a2 (configure: MinGW respect --bindir argument)
3/31 Checking commit b981bddaf3b1 (x86/cpu: Use max host physical address if -cpu max option is applied)
WARNING: line over 80 characters
#27: FILE: target/i386/cpu.c:4322:
+        object_property_set_bool(OBJECT(cpu), "host-phys-bits", true, &error_abort);

total: 0 errors, 1 warnings, 7 lines checked

Patch 3/31 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
4/31 Checking commit c6ae035743a2 (build-system: clean up TCG/TCI configury)
5/31 Checking commit 201c7afcfdda (util/cacheflush: Fix error generated by clang)
6/31 Checking commit 6f15f3c12f74 (softmmu/physmem: Silence GCC 10 maybe-uninitialized error)
7/31 Checking commit 08be6c9b3812 (ide: atapi: check logical block address and read size (CVE-2020-29443))
8/31 Checking commit 8922c06bbfeb (build-sys: remove unused LIBS)
9/31 Checking commit 51e6567ee41a (build-sys: set global arguments for cflags/ldflags)
10/31 Checking commit 13a0c33ae299 (build-sys: add libvhost-user missing dependencies)
11/31 Checking commit a1e89edfc8f7 (slirp: update to git master)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#162: 
deleted file mode 160000

total: 0 errors, 1 warnings, 98 lines checked

Patch 11/31 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
12/31 Checking commit e7b75e08c98c (meson: Declare have_virtfs_proxy_helper in main meson.build)
13/31 Checking commit f464b383c7da (nsis: adjust for new MinGW paths)
14/31 Checking commit f678a100a38d (meson: convert wixl detection to Meson)
15/31 Checking commit 86dcc24dd9dc (meson: Summarize information related to directories first)
16/31 Checking commit bfb3d06eba81 (meson: Display host binaries information altogether)
17/31 Checking commit b807fd55855f (meson: Summarize overall features altogether)
18/31 Checking commit b332b017845e (meson: Summarize compilation-related information altogether)
19/31 Checking commit 6336d44fb99d (meson: Display accelerators and selected targets altogether)
20/31 Checking commit 0e8b8535cc27 (meson: Display block layer information altogether)
21/31 Checking commit 88a07a2eae5b (meson: Display crypto-related information altogether)
22/31 Checking commit a8e31f6502b3 (meson: Add a section header for library dependencies)
23/31 Checking commit cc9100905835 (meson.build: Declare global edk2_targets / install_edk2_blobs variables)
24/31 Checking commit 82574e933d76 (meson.build: Detect bzip2 program)
25/31 Checking commit e784bbe429cc (acceptance: switch to QMP change-vnc-password command)
26/31 Checking commit 8581d24544ed (hmp: remove "change vnc TARGET" command)
27/31 Checking commit fe666fbc2118 (qmp: remove deprecated "change" command)
28/31 Checking commit d70fb5faea9d (vnc: support "-vnc help")
29/31 Checking commit d44f2ed07723 (qemu-option: clean up id vs. list->merge_lists)
30/31 Checking commit 601145bf2b6a (qemu-option: move help handling to get_opt_name_value)
31/31 Checking commit 4a3ceb3536d1 (qemu-option: warn for short-form boolean options)
WARNING: line over 80 characters
#81: FILE: util/qemu-option.c:787:
+                warn_report("short-form boolean option '%s%s' deprecated", prefix, *name);

WARNING: line over 80 characters
#100: FILE: util/qemu-option.c:818:
+        p = get_opt_name_value(p, firstname, warn_on_flag, help_wanted, &option, &value);

total: 0 errors, 2 warnings, 127 lines checked

Patch 31/31 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/20210123143128.1167797-1-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 Jan. 23, 2021, 7:52 p.m. UTC | #2
On Sat, 23 Jan 2021 at 14:36, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> The following changes since commit fef80ea073c4862bc9eaddb6ddb0ed970b8ad7c4:
>
>   Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2021-01-20' into staging (2021-01-21 10:44:28 +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to fc70d67e73e9cba950cf9d16281a78eb4ab6e4ce:
>
>   qemu-option: warn for short-form boolean options (2021-01-23 09:29:42 -0500)
>
> ----------------------------------------------------------------
> * Make MinGW respect --bindir (Joshua)
> * Switch MinGW to a "deep" installation (Joshua + NSIS fixes by myself)
> * Fix compilation errors/warnings (Qixin, Philippe)
> * Switch slirp to a subproject (Marc-André)
> * QemuOpts cleanups (myself)
> * Consistency improvements for -action (myself)
> * remove deprecated "change vnc TARGET" functionality (myself)
> * meson cleanups (Philippe, myself)
> * IDE out-of-bounds access (Prasad)
> * LA57 fix for -cpu max (Weijiang)

Fails to compile, OSX. There's an oddball "unable to rmdir"
warning immediately on git checkout, which may or may not be
related:

From git://git-us.linaro.org/people/pmaydell/qemu-arm
   e93c65a6c6..9bfe4825ae  staging    -> pmaydell/staging
warning: unable to rmdir 'slirp': Directory not empty
make: Entering directory '/Users/pm215/src/qemu-for-merges/build/all'
config-host.mak is out-of-date, running configure
Disabling PIE due to missing toolchain support
Submodule 'subprojects/libslirp'
(https://git.qemu.org/git/libslirp.git) registered for path
'subprojects/libslirp'
Cloning into '/Users/pm215/src/qemu-for-merges/subprojects/libslirp'...
cross containers  no

NOTE: guest cross-compilers enabled: cc
/usr/local/bin/ninja  build.ninja && touch build.ninja.stamp
[...]
ninja: no work to do.
/usr/local/bin/python3 -B
/Users/pm215/src/qemu-for-merges/meson/meson.py introspect --targets
--tests --benchmarks | /usr/local/bin/python3 -B scripts/mtest2make.py
> Makefile.mtest
[1/5915] Compiling C object
subprojects/libslirp/libslirp.0.dylib.p/src_ip_output.c.o
[2/5915] Compiling C object subprojects/libslirp/libslirp.0.dylib.p/src_ncsi.c.o
[3/5915] Compiling C object subprojects/libslirp/libslirp.0.dylib.p/src_mbuf.c.o
[4/5915] Compiling C object subprojects/libslirp/libslirp.0.dylib.p/src_misc.c.o
[5/5915] Compiling C object
subprojects/libslirp/libslirp.0.dylib.p/src_slirp.c.o
FAILED: subprojects/libslirp/libslirp.0.dylib.p/src_slirp.c.o
cc -Isubprojects/libslirp/libslirp.0.dylib.p -Isubprojects/libslirp
-I../../subprojects/libslirp -I/usr/local/Cellar/glib/2.66.1/include
-I/usr/local/Cellar/glib/2.66.1/include/glib-2.0
-I/usr/local/Cellar/glib/2.66.1/lib/glib-2.0/include
-I/usr/local/opt/gettext/include -I/usr/local/Cellar/pcre/8.44/include
-Xclang -fcolor-diagnostics -pipe -Wall -Winvalid-pch -std=gnu99 -O2
-g -m64 -mcx16 -DOS_OBJECT_USE_OBJC=0 -arch x86_64 -D_GNU_SOURCE
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes
-Wredundant-decls -Wundef -Wwrite-strings -Wmissing-prototypes
-fno-strict-aliasing -fno-common -fwrapv -fdiagnostics-color=never
-Werror -Wno-error=deprecated-declarations -Wold-style-definition
-Wtype-limits -Wformat-security -Wformat-y2k -Winit-self
-Wignored-qualifiers -Wempty-body -Wnested-externs -Wendif-labels
-Wexpansion-to-defined -Wno-initializer-overrides
-Wno-missing-include-dirs -Wno-shift-negative-value
-Wno-string-plus-int -Wno-typedef-redefinition
-Wno-tautological-type-limit-compare -fstack-protector-strong
'-DG_LOG_DOMAIN="Slirp"' -MD -MQ
subprojects/libslirp/libslirp.0.dylib.p/src_slirp.c.o -MF
subprojects/libslirp/libslirp.0.dylib.p/src_slirp.c.o.d -o
subprojects/libslirp/libslirp.0.dylib.p/src_slirp.c.o -c
../../subprojects/libslirp/src/slirp.c
../../subprojects/libslirp/src/slirp.c:131:17: error: unused variable
'old_stat' [-Werror,-Wunused-variable]
    struct stat old_stat;
                ^
../../subprojects/libslirp/src/slirp.c:143:10: error: unused variable
'buff' [-Werror,-Wunused-variable]
    char buff[512];
         ^
2 errors generated.
[6/5915] Compiling C object subprojects/libslirp/libslirp.0.dylib.p/src_sbuf.c.o
[7/5915] Compiling C object
subprojects/libslirp/libslirp.0.dylib.p/src_ndp_table.c.o
[8/5915] Compiling C object
subprojects/libslirp/libslirp.0.dylib.p/src_socket.c.o
ninja: build stopped: subcommand failed.

thanks
-- PMM