[PULL 00/13] Misc patches

Daniel P. Berrangé posted 13 patches 3 years, 2 months ago
Failed in applying to current master (apply log)
There is a newer version of this series
Makefile                        | 24 ++-----------
configure                       | 51 +++++++++++++++++++-------
crypto/aes.c                    |  6 ++--
crypto/desrfb.c                 |  4 +--
crypto/secret.c                 | 14 --------
crypto/secret_common.c          | 21 +++++++++--
crypto/secret_keyring.c         | 14 --------
crypto/tlscredsanon.c           |  3 +-
crypto/tlscredspsk.c            |  3 +-
crypto/tlscredsx509.c           |  5 ++-
docs/system/build-platforms.rst | 63 ++++++++++++---------------------
docs/system/deprecated.rst      | 12 +++++++
docs/system/tls.rst             |  2 +-
docs/system/vnc-security.rst    | 10 +++---
include/authz/listfile.h        |  2 +-
os-posix.c                      |  3 ++
qemu-options.hx                 |  4 +--
scripts/git-submodule.sh        | 34 +++++++++++++-----
tests/crypto-tls-x509-helpers.c | 10 +++---
tests/crypto-tls-x509-helpers.h |  2 +-
tests/pkix_asn1_tab.c           |  2 +-
tests/qemu-iotests/233          |  4 +--
tests/test-authz-pam.c          | 10 +++++-
ui/keycodemapdb                 |  2 +-
ui/meson.build                  |  3 +-
25 files changed, 161 insertions(+), 147 deletions(-)
[PULL 00/13] Misc patches
Posted by Daniel P. Berrangé 3 years, 2 months ago
The following changes since commit 5101d00d2f1138a73344dc4833587f76d7a5fa5c:

  Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-6.0-p=
ull-request' into staging (2021-01-29 10:10:43 +0000)

are available in the Git repository at:

  https://gitlab.com/berrange/qemu tags/misc-fixes-pull-request

for you to fetch changes up to ecb98f5c7589ba8ecd15c8b1baa2ec7192e47c75:

  tests: Replace deprecated ASN1 code (2021-01-29 17:07:53 +0000)

----------------------------------------------------------------
* Replace --enable/disable-git-update with --with-git-submodules
  to allow improved control over use of git submodules
* Deprecate the -enable-fips option
* Ensure docs use prefer format for bool options
* Clarify platform support rules
* Misc fixes to keymap conversions
* Fix misc problems on macOS

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

Dan Streetman (1):
  configure: replace --enable/disable-git-update with
    --with-git-submodules

Daniel P. Berrang=C3=A9 (5):
  os: deprecate the -enable-fips option and QEMU's FIPS enforcement
  Prefer 'on' | 'off' over 'yes' | 'no' for bool options
  docs: simplify and clarify the platform support rules
  docs: fix missing backslash in certtool shell example
  ui: update keycodemapdb submodule commit

Kevin Wolf (3):
  crypto: Move USER_CREATABLE to secret_common base class
  crypto: Forbid broken unloading of secrets
  crypto: Fix memory leaks in set_loaded for tls-*

Stefan Weil (2):
  tests: Fix runtime error in test-authz-pam
  tests: Replace deprecated ASN1 code

shiliyang (2):
  crypto: Fix some code style problems, add spaces around operator
  crypto: Add spaces around operator

 Makefile                        | 24 ++-----------
 configure                       | 51 +++++++++++++++++++-------
 crypto/aes.c                    |  6 ++--
 crypto/desrfb.c                 |  4 +--
 crypto/secret.c                 | 14 --------
 crypto/secret_common.c          | 21 +++++++++--
 crypto/secret_keyring.c         | 14 --------
 crypto/tlscredsanon.c           |  3 +-
 crypto/tlscredspsk.c            |  3 +-
 crypto/tlscredsx509.c           |  5 ++-
 docs/system/build-platforms.rst | 63 ++++++++++++---------------------
 docs/system/deprecated.rst      | 12 +++++++
 docs/system/tls.rst             |  2 +-
 docs/system/vnc-security.rst    | 10 +++---
 include/authz/listfile.h        |  2 +-
 os-posix.c                      |  3 ++
 qemu-options.hx                 |  4 +--
 scripts/git-submodule.sh        | 34 +++++++++++++-----
 tests/crypto-tls-x509-helpers.c | 10 +++---
 tests/crypto-tls-x509-helpers.h |  2 +-
 tests/pkix_asn1_tab.c           |  2 +-
 tests/qemu-iotests/233          |  4 +--
 tests/test-authz-pam.c          | 10 +++++-
 ui/keycodemapdb                 |  2 +-
 ui/meson.build                  |  3 +-
 25 files changed, 161 insertions(+), 147 deletions(-)

--=20
2.29.2


Re: [PULL 00/13] Misc patches
Posted by no-reply@patchew.org 3 years, 2 months ago
Patchew URL: https://patchew.org/QEMU/20210129171102.4109641-1-berrange@redhat.com/



Hi,

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

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

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
>From https://github.com/patchew-project/qemu
 * [new tag]         patchew/20210129171102.4109641-1-berrange@redhat.com -> patchew/20210129171102.4109641-1-berrange@redhat.com
Switched to a new branch 'test'
d1a54cc tests: Replace deprecated ASN1 code
fa7ea70 tests: Fix runtime error in test-authz-pam
085f233 ui: update keycodemapdb submodule commit
60edf69 crypto: Add spaces around operator
b9680cd configure: replace --enable/disable-git-update with --with-git-submodules
6db8348 docs: fix missing backslash in certtool shell example
4a5ba18 docs: simplify and clarify the platform support rules
89433ae Prefer 'on' | 'off' over 'yes' | 'no' for bool options
de66ba1 os: deprecate the -enable-fips option and QEMU's FIPS enforcement
aadd818 crypto: Fix memory leaks in set_loaded for tls-*
e5056b8 crypto: Forbid broken unloading of secrets
96f48a1 crypto: Move USER_CREATABLE to secret_common base class
0a666a6 crypto: Fix some code style problems, add spaces around operator

=== OUTPUT BEGIN ===
1/13 Checking commit 0a666a653a56 (crypto: Fix some code style problems, add spaces around operator)
2/13 Checking commit 96f48a1f4123 (crypto: Move USER_CREATABLE to secret_common base class)
3/13 Checking commit e5056b897b03 (crypto: Forbid broken unloading of secrets)
4/13 Checking commit aadd818a731a (crypto: Fix memory leaks in set_loaded for tls-*)
5/13 Checking commit de66ba1527d2 (os: deprecate the -enable-fips option and QEMU's FIPS enforcement)
6/13 Checking commit 89433ae1e17b (Prefer 'on' | 'off' over 'yes' | 'no' for bool options)
7/13 Checking commit 4a5ba182d293 (docs: simplify and clarify the platform support rules)
8/13 Checking commit 6db83486e869 (docs: fix missing backslash in certtool shell example)
9/13 Checking commit b9680cded03f (configure: replace --enable/disable-git-update with --with-git-submodules)
10/13 Checking commit 60edf69c0fbf (crypto: Add spaces around operator)
ERROR: braces {} are necessary for all arms of this statement
#28: FILE: crypto/aes.c:1083:
+        if (bits == 128)
[...]
-        else if (bits==192)
[...]
                 key->rounds = 12;
[...]

ERROR: braces {} are necessary for all arms of this statement
#31: FILE: crypto/aes.c:1085:
+        else if (bits == 192)
[...]
         else
[...]

ERROR: space prohibited after that open parenthesis '('
#44: FILE: crypto/desrfb.c:96:
+                        if( pcr[pc2[j + 24]] ) kn[n] |= bigbyte[j];

ERROR: space prohibited before that close parenthesis ')'
#44: FILE: crypto/desrfb.c:96:
+                        if( pcr[pc2[j + 24]] ) kn[n] |= bigbyte[j];

ERROR: space required before the open parenthesis '('
#44: FILE: crypto/desrfb.c:96:
+                        if( pcr[pc2[j + 24]] ) kn[n] |= bigbyte[j];

ERROR: trailing statements should be on next line
#44: FILE: crypto/desrfb.c:96:
+                        if( pcr[pc2[j + 24]] ) kn[n] |= bigbyte[j];

ERROR: braces {} are necessary for all arms of this statement
#44: FILE: crypto/desrfb.c:96:
+                        if( pcr[pc2[j + 24]] ) kn[n] |= bigbyte[j];
[...]

total: 7 errors, 0 warnings, 19 lines checked

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

11/13 Checking commit 085f2338c909 (ui: update keycodemapdb submodule commit)
12/13 Checking commit fa7ea706d673 (tests: Fix runtime error in test-authz-pam)
13/13 Checking commit d1a54cc3e1b1 (tests: Replace deprecated ASN1 code)
=== OUTPUT END ===

Test command exited with code: 1


The full log is available at
http://patchew.org/logs/20210129171102.4109641-1-berrange@redhat.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com

Re: [PULL 00/13] Misc patches
Posted by Peter Maydell 3 years, 2 months ago
On Fri, 29 Jan 2021 at 17:27, Daniel P. Berrangé <berrange@redhat.com> wrote:
>
> The following changes since commit 5101d00d2f1138a73344dc4833587f76d7a5fa5c:
>
>   Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-6.0-p=
> ull-request' into staging (2021-01-29 10:10:43 +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/berrange/qemu tags/misc-fixes-pull-request
>
> for you to fetch changes up to ecb98f5c7589ba8ecd15c8b1baa2ec7192e47c75:
>
>   tests: Replace deprecated ASN1 code (2021-01-29 17:07:53 +0000)
>
> ----------------------------------------------------------------
> * Replace --enable/disable-git-update with --with-git-submodules
>   to allow improved control over use of git submodules
> * Deprecate the -enable-fips option
> * Ensure docs use prefer format for bool options
> * Clarify platform support rules
> * Misc fixes to keymap conversions
> * Fix misc problems on macOS
>
> ----------------------------------------------------------------



Applied, thanks.

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

-- PMM