qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] d60c3b: bsd-user: whitespace changes


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] d60c3b: bsd-user: whitespace changes
Date: Thu, 20 May 2021 10:41:54 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: d60c3b932e2fa06aba5d7aa1c451b5d287095dc8
      
https://github.com/qemu/qemu/commit/d60c3b932e2fa06aba5d7aa1c451b5d287095dc8
  Author: Warner Losh <imp@bsdimp.com>
  Date:   2021-05-11 (Tue, 11 May 2021)

  Changed paths:
    M bsd-user/main.c

  Log Message:
  -----------
  bsd-user: whitespace changes

Space after keywords, no space for function calls and spaces around operators.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>


  Commit: 81afda4a6e62ba791e69388635b132d70dcbb5df
      
https://github.com/qemu/qemu/commit/81afda4a6e62ba791e69388635b132d70dcbb5df
  Author: Warner Losh <imp@bsdimp.com>
  Date:   2021-05-11 (Tue, 11 May 2021)

  Changed paths:
    M bsd-user/main.c

  Log Message:
  -----------
  bsd-user: style tweak: use C not C++ comments

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>


  Commit: 9c039f0eddeb5b102c452aea43a2160095d5ccd5
      
https://github.com/qemu/qemu/commit/9c039f0eddeb5b102c452aea43a2160095d5ccd5
  Author: Warner Losh <imp@bsdimp.com>
  Date:   2021-05-11 (Tue, 11 May 2021)

  Changed paths:
    M bsd-user/main.c

  Log Message:
  -----------
  bsd-user: style tweak: Remove #if 0'd code

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>


  Commit: 34bc8475b3778beac98c34602c8cc40ec6ef46de
      
https://github.com/qemu/qemu/commit/34bc8475b3778beac98c34602c8cc40ec6ef46de
  Author: Warner Losh <imp@bsdimp.com>
  Date:   2021-05-11 (Tue, 11 May 2021)

  Changed paths:
    M bsd-user/main.c

  Log Message:
  -----------
  bsd-user: style tweak: Use preferred block comments

Use the preferred block comment style.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>


  Commit: ac31939941932de66e7848f1ee53d404e8ab0a2f
      
https://github.com/qemu/qemu/commit/ac31939941932de66e7848f1ee53d404e8ab0a2f
  Author: Warner Losh <imp@bsdimp.com>
  Date:   2021-05-11 (Tue, 11 May 2021)

  Changed paths:
    M bsd-user/qemu.h

  Log Message:
  -----------
  bsd-user: Remove commented out code

Remove dead code that's been commented out forever.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>


  Commit: 4b599848a8eac9cb12151c81c8815af2c1e03691
      
https://github.com/qemu/qemu/commit/4b599848a8eac9cb12151c81c8815af2c1e03691
  Author: Warner Losh <imp@bsdimp.com>
  Date:   2021-05-11 (Tue, 11 May 2021)

  Changed paths:
    M bsd-user/main.c
    M bsd-user/qemu.h

  Log Message:
  -----------
  bsd-user: style tweak: move extern to header file

extern char **environ has no standard home, so move the declaration from the .c
file to a handy .h file. Since this is a standard, old-school UNIX interface
dating from the 5th edition, it's not quite the same issue that the rule is
supposed to protect against, though.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>


  Commit: 036a013f3036b9f441e0dc8bbf0237a8c789cf7a
      
https://github.com/qemu/qemu/commit/036a013f3036b9f441e0dc8bbf0237a8c789cf7a
  Author: Warner Losh <imp@bsdimp.com>
  Date:   2021-05-11 (Tue, 11 May 2021)

  Changed paths:
    M bsd-user/qemu.h

  Log Message:
  -----------
  bsd-user: style tweak: remove spacing after '*' and add after }

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>


  Commit: c2bdd9a133dc9d47449c1a432df42ed38118e01c
      
https://github.com/qemu/qemu/commit/c2bdd9a133dc9d47449c1a432df42ed38118e01c
  Author: Warner Losh <imp@bsdimp.com>
  Date:   2021-05-11 (Tue, 11 May 2021)

  Changed paths:
    M bsd-user/qemu.h

  Log Message:
  -----------
  bsd-user: style tweak: Use preferred block comments

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>


  Commit: 3306693438c8ee770dca7ca5a365848d7bceef55
      
https://github.com/qemu/qemu/commit/3306693438c8ee770dca7ca5a365848d7bceef55
  Author: Warner Losh <imp@bsdimp.com>
  Date:   2021-05-11 (Tue, 11 May 2021)

  Changed paths:
    M bsd-user/qemu.h

  Log Message:
  -----------
  bsd-user: style tweak: don't assign in if statements

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>


  Commit: cb0ea0197f17bc6ed4a21e3c872d440501f055f0
      
https://github.com/qemu/qemu/commit/cb0ea0197f17bc6ed4a21e3c872d440501f055f0
  Author: Warner Losh <imp@bsdimp.com>
  Date:   2021-05-11 (Tue, 11 May 2021)

  Changed paths:
    M bsd-user/qemu.h

  Log Message:
  -----------
  bsd-user: style tweak: use {} for all if statements, format else correctly

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>


  Commit: b23a51dc911da0a0e884b838d26aa1017ca2dd63
      
https://github.com/qemu/qemu/commit/b23a51dc911da0a0e884b838d26aa1017ca2dd63
  Author: Warner Losh <imp@bsdimp.com>
  Date:   2021-05-11 (Tue, 11 May 2021)

  Changed paths:
    M bsd-user/main.c

  Log Message:
  -----------
  bsd-user: style tweak: use {} consistently in for / if / else statements

Fix various issues with {} not being present on if / for statements.
Minor line length tweaks
Move an assignment in an if out.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>


  Commit: 29aabb4fc3b354e8f3bbaa1b542e27d54c324271
      
https://github.com/qemu/qemu/commit/29aabb4fc3b354e8f3bbaa1b542e27d54c324271
  Author: Warner Losh <imp@bsdimp.com>
  Date:   2021-05-11 (Tue, 11 May 2021)

  Changed paths:
    M bsd-user/main.c

  Log Message:
  -----------
  bsd-user: use qemu_strtoul in preference to strtol

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>


  Commit: b4bebeee1dee8d333bfa105a6c28fec5eb34b147
      
https://github.com/qemu/qemu/commit/b4bebeee1dee8d333bfa105a6c28fec5eb34b147
  Author: Warner Losh <imp@bsdimp.com>
  Date:   2021-05-11 (Tue, 11 May 2021)

  Changed paths:
    M bsd-user/elfload.c

  Log Message:
  -----------
  bsd-user: whitespace changes

Fix various whitespace-only issues from checkpatch:
    keyword space (
    no space before ( on function calls
    spaces around operators
    suspect indentations (including one functions reindented)
    extra spaces around unary operators

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>


  Commit: 86545e7afe3f822b8561c7ceee7540fc3b19c3f0
      
https://github.com/qemu/qemu/commit/86545e7afe3f822b8561c7ceee7540fc3b19c3f0
  Author: Warner Losh <imp@bsdimp.com>
  Date:   2021-05-11 (Tue, 11 May 2021)

  Changed paths:
    M bsd-user/syscall.c

  Log Message:
  -----------
  bsd-user: style tweak: keyword space (

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>


  Commit: f4a1016fb375b9a4c454002db5dabaf145086d1a
      
https://github.com/qemu/qemu/commit/f4a1016fb375b9a4c454002db5dabaf145086d1a
  Author: Warner Losh <imp@bsdimp.com>
  Date:   2021-05-11 (Tue, 11 May 2021)

  Changed paths:
    M bsd-user/uaccess.c

  Log Message:
  -----------
  bsd-user: style tweak: keyword space (

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>


  Commit: 5a3d8177bf0ce9f541072fc8a02a070d40445c63
      
https://github.com/qemu/qemu/commit/5a3d8177bf0ce9f541072fc8a02a070d40445c63
  Author: Warner Losh <imp@bsdimp.com>
  Date:   2021-05-11 (Tue, 11 May 2021)

  Changed paths:
    M bsd-user/strace.c

  Log Message:
  -----------
  bsd-user: style tweak: Remove #if 0'd code

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>


  Commit: 5be1d0b566c6f7f37482f9cce33345ffef76b4bc
      
https://github.com/qemu/qemu/commit/5be1d0b566c6f7f37482f9cce33345ffef76b4bc
  Author: Warner Losh <imp@bsdimp.com>
  Date:   2021-05-11 (Tue, 11 May 2021)

  Changed paths:
    M bsd-user/mmap.c

  Log Message:
  -----------
  bsd-user: style tweak: keyword space (

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>


  Commit: 65d58c91ef1a15ad945ece367983437576f8e82b
      
https://github.com/qemu/qemu/commit/65d58c91ef1a15ad945ece367983437576f8e82b
  Author: Warner Losh <imp@bsdimp.com>
  Date:   2021-05-11 (Tue, 11 May 2021)

  Changed paths:
    R bsd-user/i386/target_signal.h
    M bsd-user/qemu.h
    M bsd-user/signal.c
    R bsd-user/sparc/target_signal.h
    R bsd-user/sparc64/target_signal.h
    R bsd-user/x86_64/target_signal.h

  Log Message:
  -----------
  bsd-user: remove target_signal.h, it's unused

Remove the target_signal.h file. None of its contents are currently used and the
bsd-user fork doesn't use them (so this reduces the diffs there).

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>


  Commit: f8ce39701b5be032fb3f9c05e8adb4055f70eec2
      
https://github.com/qemu/qemu/commit/f8ce39701b5be032fb3f9c05e8adb4055f70eec2
  Author: Warner Losh <imp@bsdimp.com>
  Date:   2021-05-11 (Tue, 11 May 2021)

  Changed paths:
    R default-configs/targets/sparc-bsd-user.mak
    R default-configs/targets/sparc64-bsd-user.mak

  Log Message:
  -----------
  bsd-user: Stop building the sparc targets

The forked bsd-user tree doesn't really support these targets.  They aren't
functional at the moment anyway. Remove them from the build so that the major
reorg patch series can focus on one platform (x86) before adding addition
platforms once things are shuffled. This should make it easier to review and
satisfy that all revisions of a patch series are buildable.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>


  Commit: afcbcff80bf81a3399e24c7908b17776e1489df9
      
https://github.com/qemu/qemu/commit/afcbcff80bf81a3399e24c7908b17776e1489df9
  Author: Warner Losh <imp@bsdimp.com>
  Date:   2021-05-11 (Tue, 11 May 2021)

  Changed paths:
    M bsd-user/bsdload.c
    M bsd-user/elfload.c
    M bsd-user/qemu.h

  Log Message:
  -----------
  bsd-user: rename linux_binprm to bsd_binprm

Rename linux_binprm to bsd_binprm to reflect that we're loading BSD binaries,
not ELF ones.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>


  Commit: a1362f392b0aafd197eec0f4f85fd247f7468f2d
      
https://github.com/qemu/qemu/commit/a1362f392b0aafd197eec0f4f85fd247f7468f2d
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-05-20 (Thu, 20 May 2021)

  Changed paths:
    M bsd-user/bsdload.c
    M bsd-user/elfload.c
    R bsd-user/i386/target_signal.h
    M bsd-user/main.c
    M bsd-user/mmap.c
    M bsd-user/qemu.h
    M bsd-user/signal.c
    R bsd-user/sparc/target_signal.h
    R bsd-user/sparc64/target_signal.h
    M bsd-user/strace.c
    M bsd-user/syscall.c
    M bsd-user/uaccess.c
    R bsd-user/x86_64/target_signal.h
    R default-configs/targets/sparc-bsd-user.mak
    R default-configs/targets/sparc64-bsd-user.mak

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/bsdimp/tags/pull-bsd-user-20210511' 
into staging

pull-bsd-user-20210511 is the next round of cleanups to bsd-user in merging the
bsd-user fork into qemu. It contains a number of style commits, as well as 3
commits that start to change things: Some unused files are deleted, building the
sparc and sparc64 targets are removed, and a structure is renamed.

The next set of pull requests will start to execute the following plan:
1. Move existing code around to have a structure similar to the bsd-user fork.
2. Incrementally merge groups of system calls, focused on making x86 work.
3. Once the groups of system calls are all merged, additional platforms will
   be added back.
4. Concurrently, as changes are requested as part of the merge happen, those
   changes will be merged into the fork. An experimental merge to tip of master
   is under test and is what will be updated.
5. Eventually, there will be no diference, and the bsd-user fork will only
   be a staging area for cutting-edge features prior to upstreaming into
   qemu mainline.

The bsd-user code in qemu has a lot of style issues. This cleans up a number in
the files touched. However, the checkpatch.pl detects some incremental issues in
the commits. The following are expected, but are corrected in later hashes in
this branch. MAINTAINERS does not need to be updated, since all the files added
or deleted are covered under existing regexp in MAINTAINERS.

Checking all commits since f9a576a818044133f8564e0d243ebd97df0b3280...
d60c3b932e2fa06aba5d7aa1c451b5d287095dc8:101: ERROR: consider using qemu_strtol 
in preference to strtol
d60c3b932e2fa06aba5d7aa1c451b5d287095dc8:142: ERROR: braces {} are necessary 
for all arms of this statement
d60c3b932e2fa06aba5d7aa1c451b5d287095dc8:145: ERROR: braces {} are necessary 
for all arms of this statement
total: 3 errors, 0 warnings, 119 lines checked
b4bebeee1dee8d333bfa105a6c28fec5eb34b147:148: WARNING: line over 80 characters
b4bebeee1dee8d333bfa105a6c28fec5eb34b147:330: ERROR: braces {} are necessary 
for all arms of this statement
b4bebeee1dee8d333bfa105a6c28fec5eb34b147:340: ERROR: braces {} are necessary 
for all arms of this statement
b4bebeee1dee8d333bfa105a6c28fec5eb34b147:381: ERROR: space prohibited between 
function name and open parenthesis '('
b4bebeee1dee8d333bfa105a6c28fec5eb34b147:390: ERROR: spaces required around 
that '<' (ctx:VxV)
b4bebeee1dee8d333bfa105a6c28fec5eb34b147:408: WARNING: Block comments use a 
leading /* on a separate line
b4bebeee1dee8d333bfa105a6c28fec5eb34b147:409: WARNING: Block comments use * on 
subsequent lines
b4bebeee1dee8d333bfa105a6c28fec5eb34b147:409: WARNING: Block comments use a 
trailing */ on a separate line
b4bebeee1dee8d333bfa105a6c28fec5eb34b147:441: WARNING: line over 80 characters
b4bebeee1dee8d333bfa105a6c28fec5eb34b147:445: WARNING: line over 80 characters
b4bebeee1dee8d333bfa105a6c28fec5eb34b147:502: ERROR: line over 90 characters
b4bebeee1dee8d333bfa105a6c28fec5eb34b147:551: ERROR: space required after that 
',' (ctx:VxV)
b4bebeee1dee8d333bfa105a6c28fec5eb34b147:552: ERROR: space required after that 
',' (ctx:VxV)
b4bebeee1dee8d333bfa105a6c28fec5eb34b147:587: ERROR: space required after that 
';' (ctx:VxV)
b4bebeee1dee8d333bfa105a6c28fec5eb34b147:623: ERROR: suspect code indent for 
conditional statements (12, 14)
total: 9 errors, 6 warnings, 664 lines checked
86545e7afe3f822b8561c7ceee7540fc3b19c3f0:31: ERROR: space required after that 
';' (ctx:VxV)
86545e7afe3f822b8561c7ceee7540fc3b19c3f0:40: ERROR: space required after that 
';' (ctx:VxV)
total: 2 errors, 0 warnings, 60 lines checked
Use of uninitialized value $acpi_testexpected in string eq at 
scripts/checkpatch.pl line 1529.
65d58c91ef1a15ad945ece367983437576f8e82b:22: WARNING: added, moved or deleted 
file(s), does MAINTAINERS need updating?
total: 0 errors, 1 warnings, 14 lines checked
Use of uninitialized value $acpi_testexpected in string eq at 
scripts/checkpatch.pl line 1529.
f8ce39701b5be032fb3f9c05e8adb4055f70eec2:21: WARNING: added, moved or deleted 
file(s), does MAINTAINERS need updating?
total: 0 errors, 1 warnings, 0 lines checked
   FAIL one or more commits failed scripts/checkpatch.pl
Cleaning up file based variables
ERROR: Job failed: exit code 1

# gpg: Signature made Wed 12 May 2021 17:40:34 BST
# gpg:                using RSA key 2035F894B00AA3CF7CCDE1B76C1CD1287DB01100
# gpg: Good signature from "Warner Losh <wlosh@netflix.com>" [unknown]
# gpg:                 aka "Warner Losh <imp@bsdimp.com>" [unknown]
# gpg:                 aka "Warner Losh <imp@freebsd.org>" [unknown]
# gpg:                 aka "Warner Losh <imp@village.org>" [unknown]
# gpg:                 aka "Warner Losh <wlosh@bsdimp.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 2035 F894 B00A A3CF 7CCD  E1B7 6C1C D128 7DB0 1100

* remotes/bsdimp/tags/pull-bsd-user-20210511:
  bsd-user: rename linux_binprm to bsd_binprm
  bsd-user: Stop building the sparc targets
  bsd-user: remove target_signal.h, it's unused
  bsd-user: style tweak: keyword space (
  bsd-user: style tweak: Remove #if 0'd code
  bsd-user: style tweak: keyword space (
  bsd-user: style tweak: keyword space (
  bsd-user: whitespace changes
  bsd-user: use qemu_strtoul in preference to strtol
  bsd-user: style tweak: use {} consistently in for / if / else statements
  bsd-user: style tweak: use {} for all if statements, format else correctly
  bsd-user: style tweak: don't assign in if statements
  bsd-user: style tweak: Use preferred block comments
  bsd-user: style tweak: remove spacing after '*' and add after }
  bsd-user: style tweak: move extern to header file
  bsd-user: Remove commented out code
  bsd-user: style tweak: Use preferred block comments
  bsd-user: style tweak: Remove #if 0'd code
  bsd-user: style tweak: use C not C++ comments
  bsd-user: whitespace changes

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/be05216b01d2...a1362f392b0a



reply via email to

[Prev in Thread] Current Thread [Next in Thread]