Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-6.2-pull-request...

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 "[email protected]"
# gpg: Good signature from "Laurent Vivier <[email protected]>" [full]
# gpg:                 aka "Laurent Vivier <[email protected]>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <[email protected]>" [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 <[email protected]>

diff --combined linux-user/main.c
index 45bde4598d5ab3f848bfa05f3d2650914afc2be6,5ce17e423db16646b180c825cde2beb0ad9adc42..16def5215d917316cc62affbfaeb7ff4aabb22ed
--- 1/linux-user/main.c
--- 2/linux-user/main.c
+++ b/linux-user/main.c
@@@ -30,6 -30,7 +30,7 @@@
  
  #include "qapi/error.h"
  #include "qemu.h"
+ #include "user-internals.h"
  #include "qemu/path.h"
  #include "qemu/queue.h"
  #include "qemu/config-file.h"
@@@ -39,6 -40,7 +40,7 @@@
  #include "qemu/module.h"
  #include "qemu/plugin.h"
  #include "exec/exec-all.h"
+ #include "exec/gdbstub.h"
  #include "tcg/tcg.h"
  #include "qemu/timer.h"
  #include "qemu/envlist.h"
@@@ -49,6 -51,9 +51,9 @@@
  #include "cpu_loop-common.h"
  #include "crypto/init.h"
  #include "fd-trans.h"
+ #include "signal-common.h"
+ #include "loader.h"
+ #include "user-mmap.h"
  
  #ifndef AT_FLAGS_PRESERVE_ARGV0
  #define AT_FLAGS_PRESERVE_ARGV0_BIT 0
@@@ -120,6 -125,13 +125,6 @@@ const char *qemu_uname_release
     by remapping the process stack directly at the right place */
  unsigned long guest_stack_size = 8 * 1024 * 1024UL;
  
 -#if defined(TARGET_I386)
 -int cpu_get_pic_interrupt(CPUX86State *env)
 -{
 -    return -1;
 -}
 -#endif
 -
  /***********************************************************/
  /* Helper routines for implementing atomic operations.  */