| Message ID | 20210608094017.392673-1-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Tue, Jun 08, 2021 at 11:40:05AM +0200, Paolo Bonzini wrote: > The following changes since commit 6f398e533f5e259b4f937f4aa9de970f7201d166: > > Merge remote-tracking branch 'remotes/rth-gitlab/tags/pull-tcg-20210604' into staging (2021-06-05 11:25:52 +0100) > > are available in the Git repository at: > > https://gitlab.com/bonzini/qemu.git tags/for-upstream > > for you to fetch changes up to 8f9f729185e3ac8d3c5a65d81eb9e74e229901ea: > > vnc: avoid deprecation warnings for SASL on OS X (2021-06-07 10:20:23 -0400) > > ---------------------------------------------------------------- > * introduce "-M smp" (myself) > * avoid deprecation warnings for SASL on macOS 10.11 or newer. > > ---------------------------------------------------------------- > Paolo Bonzini (12): > qom: export more functions for use with non-UserCreatable objects > keyval: introduce keyval_merge > keyval: introduce keyval_parse_into > vl: switch -M parsing to keyval > qemu-option: remove now-dead code > machine: move dies from X86MachineState to CpuTopology > machine: move common smp_parse code to caller > machine: add error propagation to mc->smp_parse > machine: pass QAPI struct to mc->smp_parse > machine: reject -smp dies!=1 for non-PC machines > machine: add smp compound property > vnc: avoid deprecation warnings for SASL on OS X None of these changes have any reviewed-by tags. Was this really meant to be sent as a PULL before getting reviews ? Regards, Daniel
Patchew URL: https://patchew.org/QEMU/20210608094017.392673-1-pbonzini@redhat.com/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Type: series
Message-id: 20210608094017.392673-1-pbonzini@redhat.com
Subject: [PULL 00/12] Machine and OS X changes for 2021-06-08
=== 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
Switched to a new branch 'test'
2e2607b vnc: avoid deprecation warnings for SASL on OS X
b944e00 machine: add smp compound property
4f6c15b machine: reject -smp dies!=1 for non-PC machines
d72236a machine: pass QAPI struct to mc->smp_parse
a464edf machine: add error propagation to mc->smp_parse
95d7450 machine: move common smp_parse code to caller
411cbbf machine: move dies from X86MachineState to CpuTopology
939528c qemu-option: remove now-dead code
5ade2c0 vl: switch -M parsing to keyval
99fc4e5 keyval: introduce keyval_parse_into
ddae823 keyval: introduce keyval_merge
a602bbd qom: export more functions for use with non-UserCreatable objects
=== OUTPUT BEGIN ===
1/12 Checking commit a602bbd492a8 (qom: export more functions for use with non-UserCreatable objects)
2/12 Checking commit ddae8230a939 (keyval: introduce keyval_merge)
ERROR: line over 90 characters
#45: FILE: tests/unit/test-keyval.c:756:
+ QDict *combined = keyval_parse("opt1=ABC,opt2.sub1=def,opt2.sub2=GHI,opt2.sub3=JKL,opt3=xyz",
WARNING: line over 80 characters
#114: FILE: util/keyval.c:314:
+static void keyval_do_merge(QDict *old, const QDict *new, GString *str, Error **errp)
ERROR: line over 90 characters
#124: FILE: util/keyval.c:324:
+ error_setg(errp, "Parameter '%s%s' used inconsistently", str->str, ent->key);
total: 2 errors, 1 warnings, 127 lines checked
Patch 2/12 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
3/12 Checking commit 99fc4e57a289 (keyval: introduce keyval_parse_into)
WARNING: line over 80 characters
#26: FILE: include/qemu/option.h:150:
+QDict *keyval_parse_into(QDict *qdict, const char *params, const char *implied_key,
WARNING: line over 80 characters
#48: FILE: util/keyval.c:486:
+QDict *keyval_parse_into(QDict *qdict, const char *params, const char *implied_key,
total: 0 errors, 2 warnings, 78 lines checked
Patch 3/12 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
4/12 Checking commit 5ade2c0ebb8d (vl: switch -M parsing to keyval)
WARNING: line over 80 characters
#206: FILE: softmmu/vl.c:1592:
+ error_setg(&local_err, "No machine specified, and there is no default");
WARNING: line over 80 characters
#219: FILE: softmmu/vl.c:1598:
+ error_append_hint(&local_err, "Use -machine help to list supported machines\n");
WARNING: line over 80 characters
#256: FILE: softmmu/vl.c:1639:
+ error_setg(errp, "Conflict between '%s' and '%s'", ent->key, new_key);
WARNING: line over 80 characters
#300: FILE: softmmu/vl.c:1663:
+ object_register_sugar_prop(ACCEL_CLASS_NAME("xen"), "igd-passthru", value,
WARNING: line over 80 characters
#307: FILE: softmmu/vl.c:1670:
+ object_register_sugar_prop(ACCEL_CLASS_NAME("kvm"), "kvm-shadow-mem", value,
WARNING: line over 80 characters
#314: FILE: softmmu/vl.c:1677:
+ object_register_sugar_prop(ACCEL_CLASS_NAME("kvm"), "kernel-irqchip", value,
WARNING: line over 80 characters
#316: FILE: softmmu/vl.c:1679:
+ object_register_sugar_prop(ACCEL_CLASS_NAME("whpx"), "kernel-irqchip", value,
ERROR: line over 90 characters
#338: FILE: softmmu/vl.c:1804:
+ object_set_properties_from_keyval(OBJECT(current_machine), qdict, false, &error_fatal);
ERROR: line over 90 characters
#350: FILE: softmmu/vl.c:1834:
+ semihosting_arg_fallback(current_machine->kernel_filename, current_machine->kernel_cmdline);
ERROR: code indent should never use tabs
#414: FILE: softmmu/vl.c:2128:
+^I * Cannot merge string-valued and type-safe dictionaries, so JSON$
ERROR: code indent should never use tabs
#415: FILE: softmmu/vl.c:2129:
+^I * is not accepted yet for -M.$
ERROR: code indent should never use tabs
#416: FILE: softmmu/vl.c:2130:
+^I */$
ERROR: line over 90 characters
#526: FILE: softmmu/vl.c:3248:
+ keyval_parse_into(machine_opts_dict, optarg, "type", &help, &error_fatal);
total: 6 errors, 7 warnings, 536 lines checked
Patch 4/12 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
5/12 Checking commit 939528c36ff3 (qemu-option: remove now-dead code)
6/12 Checking commit 411cbbfb1dfb (machine: move dies from X86MachineState to CpuTopology)
7/12 Checking commit 95d745068123 (machine: move common smp_parse code to caller)
8/12 Checking commit a464edf8d5b1 (machine: add error propagation to mc->smp_parse)
9/12 Checking commit d72236a8e0da (machine: pass QAPI struct to mc->smp_parse)
WARNING: line over 80 characters
#95: FILE: hw/i386/pc.c:713:
+static void pc_smp_parse(MachineState *ms, SMPConfiguration *config, Error **errp)
total: 0 errors, 1 warnings, 133 lines checked
Patch 9/12 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
10/12 Checking commit 4f6c15b13fc8 (machine: reject -smp dies!=1 for non-PC machines)
11/12 Checking commit b944e00aa5dc (machine: add smp compound property)
ERROR: line over 90 characters
#236: FILE: softmmu/vl.c:3316:
+ machine_parse_property_opt(qemu_find_opts("smp-opts"), "smp", optarg, &error_fatal);
WARNING: line over 80 characters
#249: FILE: tests/qtest/numa-test.c:28:
+ cli = make_cli(data, "-machine smp.cpus=8 -numa node,nodeid=0,memdev=ram,cpus=0-3 "
WARNING: line over 80 characters
#258: FILE: tests/qtest/numa-test.c:45:
+ cli = make_cli(data, "-machine smp.cpus=8 -numa node,memdev=ram -numa node");
ERROR: line over 90 characters
#285: FILE: tests/qtest/numa-test.c:127:
+ cli = make_cli(data, "-cpu pentium -machine smp.cpus=8,smp.sockets=2,smp.cores=2,smp.threads=2 "
total: 2 errors, 2 warnings, 284 lines checked
Patch 11/12 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
12/12 Checking commit 2e2607be886f (vnc: avoid deprecation warnings for SASL on OS X)
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/20210608094017.392673-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
Daniel P. Berrangé <berrange@redhat.com> writes: > On Tue, Jun 08, 2021 at 11:40:05AM +0200, Paolo Bonzini wrote: >> The following changes since commit 6f398e533f5e259b4f937f4aa9de970f7201d166: >> >> Merge remote-tracking branch 'remotes/rth-gitlab/tags/pull-tcg-20210604' into staging (2021-06-05 11:25:52 +0100) >> >> are available in the Git repository at: >> >> https://gitlab.com/bonzini/qemu.git tags/for-upstream >> >> for you to fetch changes up to 8f9f729185e3ac8d3c5a65d81eb9e74e229901ea: >> >> vnc: avoid deprecation warnings for SASL on OS X (2021-06-07 10:20:23 -0400) >> >> ---------------------------------------------------------------- >> * introduce "-M smp" (myself) >> * avoid deprecation warnings for SASL on macOS 10.11 or newer. >> >> ---------------------------------------------------------------- >> Paolo Bonzini (12): >> qom: export more functions for use with non-UserCreatable objects >> keyval: introduce keyval_merge >> keyval: introduce keyval_parse_into >> vl: switch -M parsing to keyval >> qemu-option: remove now-dead code >> machine: move dies from X86MachineState to CpuTopology >> machine: move common smp_parse code to caller >> machine: add error propagation to mc->smp_parse >> machine: pass QAPI struct to mc->smp_parse >> machine: reject -smp dies!=1 for non-PC machines >> machine: add smp compound property >> vnc: avoid deprecation warnings for SASL on OS X > > None of these changes have any reviewed-by tags. PATCH 03 looks unfamiliar, so I checked: it hasn't been posted before. > Was this really meant > to be sent as a PULL before getting reviews ? Seems likely; I very much doubt Paolo would be trying to pull a fast one on us ;) Just to be machine-readably explicit: Nacked-by: Markus Armbruster <armbru@redhat.com>
On 10/06/21 07:42, Markus Armbruster wrote: >>> ---------------------------------------------------------------- >>> Paolo Bonzini (12): >>> qom: export more functions for use with non-UserCreatable objects >>> keyval: introduce keyval_merge >>> keyval: introduce keyval_parse_into >>> vl: switch -M parsing to keyval >>> qemu-option: remove now-dead code >>> machine: move dies from X86MachineState to CpuTopology >>> machine: move common smp_parse code to caller >>> machine: add error propagation to mc->smp_parse >>> machine: pass QAPI struct to mc->smp_parse >>> machine: reject -smp dies!=1 for non-PC machines >>> machine: add smp compound property >>> vnc: avoid deprecation warnings for SASL on OS X >> >> None of these changes have any reviewed-by tags. All of them however have been on the list for one to six months; the most recent post is https://patchew.org/QEMU/20210513162901.1310239-1-pbonzini@redhat.com/, but indeed I haven't posted a new version after rebasing on top of the recent -object bugfixes. > PATCH 03 looks unfamiliar, so I checked: it hasn't been posted before. The code was posted for the first time 6 months ago (https://patchew.org/QEMU/20201202090305.4129317-1-pbonzini@redhat.com/20201202090305.4129317-18-pbonzini@redhat.com/), though parts of it have been progressively separated and merged. But indeed, the part that's left and that is included in this pull request hasn't been posted separately. I'll do so now. > Seems likely; I very much doubt Paolo would be trying to pull a fast one > on us ;) Not voluntarily, at least! Sorry about that, I mis-remembered the order of the two series (which is now getting a bit more urgent, because Yang Zhong would like to use array properties in -M for SGX). Thanks, Paolo
The following changes since commit 6f398e533f5e259b4f937f4aa9de970f7201d166: Merge remote-tracking branch 'remotes/rth-gitlab/tags/pull-tcg-20210604' into staging (2021-06-05 11:25:52 +0100) are available in the Git repository at: https://gitlab.com/bonzini/qemu.git tags/for-upstream for you to fetch changes up to 8f9f729185e3ac8d3c5a65d81eb9e74e229901ea: vnc: avoid deprecation warnings for SASL on OS X (2021-06-07 10:20:23 -0400) ---------------------------------------------------------------- * introduce "-M smp" (myself) * avoid deprecation warnings for SASL on macOS 10.11 or newer. ---------------------------------------------------------------- Paolo Bonzini (12): qom: export more functions for use with non-UserCreatable objects keyval: introduce keyval_merge keyval: introduce keyval_parse_into vl: switch -M parsing to keyval qemu-option: remove now-dead code machine: move dies from X86MachineState to CpuTopology machine: move common smp_parse code to caller machine: add error propagation to mc->smp_parse machine: pass QAPI struct to mc->smp_parse machine: reject -smp dies!=1 for non-PC machines machine: add smp compound property vnc: avoid deprecation warnings for SASL on OS X hw/core/machine.c | 184 ++++++++++++++---------- hw/i386/pc.c | 108 +++++++------- hw/i386/x86.c | 15 +- include/hw/boards.h | 4 +- include/hw/i386/pc.h | 3 - include/hw/i386/x86.h | 1 - include/qemu/option.h | 6 +- include/qom/object.h | 23 +++ qapi/machine.json | 27 ++++ qom/object_interfaces.c | 58 +++++--- softmmu/vl.c | 336 ++++++++++++++++++++++---------------------- tests/qtest/numa-test.c | 22 +-- tests/unit/test-keyval.c | 56 ++++++++ tests/unit/test-qemu-opts.c | 35 ----- ui/vnc-auth-sasl.c | 20 +++ ui/vnc-auth-sasl.h | 1 + ui/vnc.c | 10 +- util/keyval.c | 90 ++++++++++-- util/qemu-option.c | 51 ++----- 19 files changed, 607 insertions(+), 443 deletions(-)