qemu-commits
[Top][All Lists]
Advanced

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

[Qemu-commits] [qemu/qemu] 400b7f: linux-user: Fix coding style nits in


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] 400b7f: linux-user: Fix coding style nits in qemu.h
Date: Thu, 16 Sep 2021 13:15:00 -0700

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 400b7f6d1465815cc3992c009caa760a668928e5
      
https://github.com/qemu/qemu/commit/400b7f6d1465815cc3992c009caa760a668928e5
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-09-13 (Mon, 13 Sep 2021)

  Changed paths:
    M linux-user/qemu.h

  Log Message:
  -----------
  linux-user: Fix coding style nits in qemu.h

We're about to move a lot of the code in qemu.h out into different
header files; fix the coding style nits first so that checkpatch
is happy with the pure code-movement patches. This is mostly
block-comment style but also a few whitespace issues.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210908154405.15417-2-peter.maydell@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: a44d57a3b9aef9691402560de5da3c03cadd16e5
      
https://github.com/qemu/qemu/commit/a44d57a3b9aef9691402560de5da3c03cadd16e5
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-09-13 (Mon, 13 Sep 2021)

  Changed paths:
    M linux-user/qemu.h
    M linux-user/signal.c
    M linux-user/strace.c
    A linux-user/strace.h
    M linux-user/syscall.c

  Log Message:
  -----------
  linux-user: Split strace prototypes into strace.h

The functions implemented in strace.c are only used in a few files in
linux-user; split them out of qemu.h and into a new strace.h header
which we include in the places that need it.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210908154405.15417-3-peter.maydell@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 2113aed687cb0b84ad512c440c1edf6eea8fcde2
      
https://github.com/qemu/qemu/commit/2113aed687cb0b84ad512c440c1edf6eea8fcde2
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-09-13 (Mon, 13 Sep 2021)

  Changed paths:
    M linux-user/aarch64/cpu_loop.c
    M linux-user/alpha/cpu_loop.c
    M linux-user/arm/cpu_loop.c
    M linux-user/cris/cpu_loop.c
    M linux-user/fd-trans.c
    M linux-user/hexagon/cpu_loop.c
    M linux-user/hppa/cpu_loop.c
    M linux-user/i386/cpu_loop.c
    M linux-user/m68k/cpu_loop.c
    M linux-user/main.c
    M linux-user/microblaze/cpu_loop.c
    M linux-user/mips/cpu_loop.c
    M linux-user/nios2/cpu_loop.c
    M linux-user/openrisc/cpu_loop.c
    M linux-user/ppc/cpu_loop.c
    M linux-user/qemu.h
    M linux-user/riscv/cpu_loop.c
    M linux-user/s390x/cpu_loop.c
    M linux-user/sh4/cpu_loop.c
    M linux-user/signal-common.h
    M linux-user/sparc/cpu_loop.c
    M linux-user/syscall.c
    M linux-user/xtensa/cpu_loop.c

  Log Message:
  -----------
  linux-user: Split signal-related prototypes into signal-common.h

Split the signal related prototypes into the existing header file
signal-common.h, and include it in those places that now require it.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210908154405.15417-4-peter.maydell@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 3ad0a76928df01726e5872b8530d8e1eaa1a971d
      
https://github.com/qemu/qemu/commit/3ad0a76928df01726e5872b8530d8e1eaa1a971d
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-09-13 (Mon, 13 Sep 2021)

  Changed paths:
    M linux-user/elfload.c
    M linux-user/flatload.c
    M linux-user/linuxload.c
    A linux-user/loader.h
    M linux-user/main.c
    M linux-user/qemu.h
    M linux-user/signal.c
    M linux-user/syscall.c

  Log Message:
  -----------
  linux-user: Split loader-related prototypes into loader.h

Split guest-binary loader prototypes out into a new header
loader.h which we include only where required.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210908154405.15417-5-peter.maydell@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 5423e6d3a416342ee5857d02688c30b776574b66
      
https://github.com/qemu/qemu/commit/5423e6d3a416342ee5857d02688c30b776574b66
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-09-13 (Mon, 13 Sep 2021)

  Changed paths:
    M linux-user/elfload.c
    M linux-user/flatload.c
    M linux-user/i386/cpu_loop.c
    M linux-user/main.c
    M linux-user/mmap.c
    M linux-user/qemu.h
    M linux-user/syscall.c
    A linux-user/user-mmap.h

  Log Message:
  -----------
  linux-user: Split mmap prototypes into user-mmap.h

Split out the mmap prototypes into a new header user-mmap.h
which we only include where required.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210908154405.15417-6-peter.maydell@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: a57e0c3657b764fa0311ffca2c72bd8dcd39e8af
      
https://github.com/qemu/qemu/commit/a57e0c3657b764fa0311ffca2c72bd8dcd39e8af
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-09-13 (Mon, 13 Sep 2021)

  Changed paths:
    M linux-user/qemu.h
    A linux-user/safe-syscall.h
    M linux-user/syscall.c

  Log Message:
  -----------
  linux-user: Split safe-syscall macro into its own header

Split the safe-syscall macro from qemu.h into a new safe-syscall.h.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210908154405.15417-7-peter.maydell@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 3b249d2661c752e75ef6d2d4ac63bdf9a921dd4b
      
https://github.com/qemu/qemu/commit/3b249d2661c752e75ef6d2d4ac63bdf9a921dd4b
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-09-13 (Mon, 13 Sep 2021)

  Changed paths:
    M linux-user/aarch64/cpu_loop.c
    M linux-user/aarch64/signal.c
    M linux-user/alpha/cpu_loop.c
    M linux-user/alpha/signal.c
    M linux-user/arm/cpu_loop.c
    M linux-user/arm/signal.c
    M linux-user/cris/cpu_loop.c
    M linux-user/cris/signal.c
    M linux-user/elfload.c
    M linux-user/exit.c
    M linux-user/fd-trans.c
    M linux-user/flatload.c
    M linux-user/hexagon/cpu_loop.c
    M linux-user/hexagon/signal.c
    M linux-user/hppa/cpu_loop.c
    M linux-user/hppa/signal.c
    M linux-user/i386/cpu_loop.c
    M linux-user/i386/signal.c
    M linux-user/linuxload.c
    M linux-user/m68k/cpu_loop.c
    M linux-user/m68k/signal.c
    M linux-user/main.c
    M linux-user/microblaze/cpu_loop.c
    M linux-user/microblaze/signal.c
    M linux-user/mips/cpu_loop.c
    M linux-user/mips/signal.c
    M linux-user/mmap.c
    M linux-user/nios2/cpu_loop.c
    M linux-user/nios2/signal.c
    M linux-user/openrisc/cpu_loop.c
    M linux-user/openrisc/signal.c
    M linux-user/ppc/cpu_loop.c
    M linux-user/ppc/signal.c
    M linux-user/qemu.h
    M linux-user/riscv/cpu_loop.c
    M linux-user/riscv/signal.c
    M linux-user/s390x/cpu_loop.c
    M linux-user/s390x/signal.c
    M linux-user/semihost.c
    M linux-user/sh4/cpu_loop.c
    M linux-user/sh4/signal.c
    M linux-user/signal.c
    M linux-user/sparc/cpu_loop.c
    M linux-user/sparc/signal.c
    M linux-user/strace.c
    M linux-user/syscall.c
    M linux-user/uaccess.c
    M linux-user/uname.c
    A linux-user/user-internals.h
    M linux-user/vm86.c
    M linux-user/xtensa/cpu_loop.c
    M linux-user/xtensa/signal.c

  Log Message:
  -----------
  linux-user: Split linux-user internals out of qemu.h

qemu.h is included in various non-linux-user files (which
mostly want the TaskState struct and the functions for
doing usermode access to guest addresses like lock_user(),
unlock_user(), get_user*(), etc).

Split out the parts that are only used in linux-user itself
into a new user-internals.h. This leaves qemu.h with basically
three things:
 * the definition of the TaskState struct
 * the user-access functions and macros
 * do_brk()
all of which are needed by code outside linux-user that
includes qemu.h.

The addition of all the extra #include lines was done with
  sed -i '/include.*qemu\.h/a #include "user-internals.h"' $(git grep -l 
'include.*qemu\.h' linux-user)
(and then undoing the change to fpa11.h).

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210908154405.15417-8-peter.maydell@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 85b4fa0cd189311dc1c69714e669b5a12b0552f6
      
https://github.com/qemu/qemu/commit/85b4fa0cd189311dc1c69714e669b5a12b0552f6
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-09-13 (Mon, 13 Sep 2021)

  Changed paths:
    M gdbstub.c
    M linux-user/exit.c
    M linux-user/main.c
    M linux-user/qemu.h
    M linux-user/signal.c
    M semihosting/arm-compat-semi.c
    M target/m68k/m68k-semi.c
    M target/nios2/nios2-semi.c

  Log Message:
  -----------
  linux-user: Don't include gdbstub.h in qemu.h

Currently the linux-user qemu.h pulls in gdbstub.h. There's no real reason
why it should do this; include it directly from the C files which require
it, and drop the include line in qemu.h.

(Note that several of the C files previously relying on this indirect
include were going out of their way to only include gdbstub.h conditionally
on not CONFIG_USER_ONLY!)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210908154405.15417-9-peter.maydell@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: d0a7920eb4fc44dd4485167edf7db7fac1de6977
      
https://github.com/qemu/qemu/commit/d0a7920eb4fc44dd4485167edf7db7fac1de6977
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-09-13 (Mon, 13 Sep 2021)

  Changed paths:
    M linux-user/qemu.h
    M linux-user/user-internals.h
    M thunk.c

  Log Message:
  -----------
  linux-user: Drop unneeded includes from qemu.h

Trim down the #includes in qemu.h where we can, either by
dropping unneeded headers or by moving them to user-internals.h.

This includes deleting a couple of #includes that appear at
weird points midway through the header file.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210908154405.15417-10-peter.maydell@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 74e43b04b0260da09d14bc56a5d629d4753b8b27
      
https://github.com/qemu/qemu/commit/74e43b04b0260da09d14bc56a5d629d4753b8b27
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-09-16 (Thu, 16 Sep 2021)

  Changed paths:
    M linux-user/syscall.c

  Log Message:
  -----------
  linux-user: Check lock_user result for ip_mreq_source sockopts

In do_setsockopt(), the code path for the options which take a struct
ip_mreq_source (IP_BLOCK_SOURCE, IP_UNBLOCK_SOURCE,
IP_ADD_SOURCE_MEMBERSHIP and IP_DROP_SOURCE_MEMBERSHIP) fails to
check the return value from lock_user().  Handle this in the usual
way by returning -TARGET_EFAULT.

(In practice this was probably harmless because we'd pass a NULL
pointer to setsockopt() and the kernel would then return EFAULT.)

Fixes: Coverity CID 1459987
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20210809155424.30968-1-peter.maydell@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: c99e34e537f13a431a80e3e414e5904e9dd0a116
      
https://github.com/qemu/qemu/commit/c99e34e537f13a431a80e3e414e5904e9dd0a116
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-09-16 (Thu, 16 Sep 2021)

  Changed paths:
    M gdbstub.c
    M linux-user/aarch64/cpu_loop.c
    M linux-user/aarch64/signal.c
    M linux-user/alpha/cpu_loop.c
    M linux-user/alpha/signal.c
    M linux-user/arm/cpu_loop.c
    M linux-user/arm/signal.c
    M linux-user/cris/cpu_loop.c
    M linux-user/cris/signal.c
    M linux-user/elfload.c
    M linux-user/exit.c
    M linux-user/fd-trans.c
    M linux-user/flatload.c
    M linux-user/hexagon/cpu_loop.c
    M linux-user/hexagon/signal.c
    M linux-user/hppa/cpu_loop.c
    M linux-user/hppa/signal.c
    M linux-user/i386/cpu_loop.c
    M linux-user/i386/signal.c
    M linux-user/linuxload.c
    A linux-user/loader.h
    M linux-user/m68k/cpu_loop.c
    M linux-user/m68k/signal.c
    M linux-user/main.c
    M linux-user/microblaze/cpu_loop.c
    M linux-user/microblaze/signal.c
    M linux-user/mips/cpu_loop.c
    M linux-user/mips/signal.c
    M linux-user/mmap.c
    M linux-user/nios2/cpu_loop.c
    M linux-user/nios2/signal.c
    M linux-user/openrisc/cpu_loop.c
    M linux-user/openrisc/signal.c
    M linux-user/ppc/cpu_loop.c
    M linux-user/ppc/signal.c
    M linux-user/qemu.h
    M linux-user/riscv/cpu_loop.c
    M linux-user/riscv/signal.c
    M linux-user/s390x/cpu_loop.c
    M linux-user/s390x/signal.c
    A linux-user/safe-syscall.h
    M linux-user/semihost.c
    M linux-user/sh4/cpu_loop.c
    M linux-user/sh4/signal.c
    M linux-user/signal-common.h
    M linux-user/signal.c
    M linux-user/sparc/cpu_loop.c
    M linux-user/sparc/signal.c
    M linux-user/strace.c
    A linux-user/strace.h
    M linux-user/syscall.c
    M linux-user/uaccess.c
    M linux-user/uname.c
    A linux-user/user-internals.h
    A linux-user/user-mmap.h
    M linux-user/vm86.c
    M linux-user/xtensa/cpu_loop.c
    M linux-user/xtensa/signal.c
    M semihosting/arm-compat-semi.c
    M target/m68k/m68k-semi.c
    M target/nios2/nios2-semi.c
    M thunk.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/vivier2/tags/linux-user-for-6.2-pull-request' into staging

Pull request linux-user 20210916

Code cleanup

# gpg: Signature made Thu 16 Sep 2021 16:11:58 BST
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" 
[full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/linux-user-for-6.2-pull-request:
  linux-user: Check lock_user result for ip_mreq_source sockopts
  linux-user: Drop unneeded includes from qemu.h
  linux-user: Don't include gdbstub.h in qemu.h
  linux-user: Split linux-user internals out of qemu.h
  linux-user: Split safe-syscall macro into its own header
  linux-user: Split mmap prototypes into user-mmap.h
  linux-user: Split loader-related prototypes into loader.h
  linux-user: Split signal-related prototypes into signal-common.h
  linux-user: Split strace prototypes into strace.h
  linux-user: Fix coding style nits in qemu.h

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


Compare: https://github.com/qemu/qemu/compare/d1fe59377bbb...c99e34e537f1



reply via email to

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