[PATCH 0/2] linux-user: Two minor patches

[PATCH 0/2] linux-user: Two minor patches

[Warner Losh]

There's two, almost trivial patches that arose out of the review of bsd-user.
There's a chance that one or both of these were submitted already...

Warner Losh (2):
  linx-user: Remove MAX_SIGQUEUE_SIZE
  linxu-user: Change return type of queue_signal to void

 linux-user/qemu.h          | 2 --
 linux-user/signal-common.h | 4 ++--
 linux-user/signal.c        | 5 ++---
 3 files changed, 4 insertions(+), 7 deletions(-)

-- 
2.33.1

[PATCH 1/2] linx-user: Remove MAX_SIGQUEUE_SIZE

[Warner Losh]

It's been unused for 7 years since 907f5fddaa67 when linux-user stopped
queueing any signals.

Signed-off-by: Warner Losh <imp@bsdimp.com>
---
 linux-user/qemu.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index 5c713fa8ab2..7910ce59cc8 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -89,8 +89,6 @@ struct vm86_saved_state {
 #include "nwfpe/fpa11.h"
 #endif
 
-#define MAX_SIGQUEUE_SIZE 1024
-
 struct emulated_sigtable {
     int pending; /* true if signal is pending */
     target_siginfo_t info;
-- 
2.33.1

Re: [PATCH 1/2] linx-user: Remove MAX_SIGQUEUE_SIZE

[Philippe Mathieu-Daudé via]

On 16/1/22 21:44, Warner Losh wrote:
> It's been unused for 7 years since 907f5fddaa67 when linux-user stopped
> queueing any signals.
> 
> Signed-off-by: Warner Losh <imp@bsdimp.com>
> ---
>   linux-user/qemu.h | 2 --
>   1 file changed, 2 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Re: [PATCH 1/2] linx-user: Remove MAX_SIGQUEUE_SIZE

[Peter Maydell]

On Sun, 16 Jan 2022 at 20:44, Warner Losh <imp@bsdimp.com> wrote:
>
> It's been unused for 7 years since 907f5fddaa67 when linux-user stopped
> queueing any signals.
>
> Signed-off-by: Warner Losh <imp@bsdimp.com>
> ---

Typo in subject (should be 'linux-user'); otherwise
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

thanks
-- PMM

Re: [PATCH 1/2] linx-user: Remove MAX_SIGQUEUE_SIZE

[Laurent Vivier]

Le 16/01/2022 à 21:44, Warner Losh a écrit :
> It's been unused for 7 years since 907f5fddaa67 when linux-user stopped
> queueing any signals.
> 
> Signed-off-by: Warner Losh <imp@bsdimp.com>
> ---
>   linux-user/qemu.h | 2 --
>   1 file changed, 2 deletions(-)
> 
> diff --git a/linux-user/qemu.h b/linux-user/qemu.h
> index 5c713fa8ab2..7910ce59cc8 100644
> --- a/linux-user/qemu.h
> +++ b/linux-user/qemu.h
> @@ -89,8 +89,6 @@ struct vm86_saved_state {
>   #include "nwfpe/fpa11.h"
>   #endif
>   
> -#define MAX_SIGQUEUE_SIZE 1024
> -
>   struct emulated_sigtable {
>       int pending; /* true if signal is pending */
>       target_siginfo_t info;

Applied to my trivial-patches branch.
(typo fixed)

Thanks,
Laurent

[PATCH 2/2] linxu-user: Change return type of queue_signal to void

[Warner Losh]

queue_signal always returns 1, and nobody checks it. This is better
expressed as a void function return type.

Signed-off-by: Warner Losh <imp@bsdimp.com>
---
 linux-user/signal-common.h | 4 ++--
 linux-user/signal.c        | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/linux-user/signal-common.h b/linux-user/signal-common.h
index 42aa479080b..2113165a758 100644
--- a/linux-user/signal-common.h
+++ b/linux-user/signal-common.h
@@ -59,8 +59,8 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
 
 void process_pending_signals(CPUArchState *cpu_env);
 void signal_init(void);
-int queue_signal(CPUArchState *env, int sig, int si_type,
-                 target_siginfo_t *info);
+void queue_signal(CPUArchState *env, int sig, int si_type,
+                  target_siginfo_t *info);
 void host_to_target_siginfo(target_siginfo_t *tinfo, const siginfo_t *info);
 void target_to_host_siginfo(siginfo_t *info, const target_siginfo_t *tinfo);
 int target_to_host_signal(int sig);
diff --git a/linux-user/signal.c b/linux-user/signal.c
index f813b4f18e4..eddc95e87df 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -780,8 +780,8 @@ static void QEMU_NORETURN dump_core_and_abort(int target_sig)
 
 /* queue a signal so that it will be send to the virtual CPU as soon
    as possible */
-int queue_signal(CPUArchState *env, int sig, int si_type,
-                 target_siginfo_t *info)
+void queue_signal(CPUArchState *env, int sig, int si_type,
+                  target_siginfo_t *info)
 {
     CPUState *cpu = env_cpu(env);
     TaskState *ts = cpu->opaque;
@@ -794,7 +794,6 @@ int queue_signal(CPUArchState *env, int sig, int si_type,
     ts->sync_signal.pending = sig;
     /* signal that a new signal is pending */
     qatomic_set(&ts->signal_pending, 1);
-    return 1; /* indicates that the signal was queued */
 }
 
 
-- 
2.33.1

Re: [PATCH 2/2] linxu-user: Change return type of queue_signal to void

[Peter Maydell]

On Sun, 16 Jan 2022 at 20:44, Warner Losh <imp@bsdimp.com> wrote:
>
> queue_signal always returns 1, and nobody checks it. This is better
> expressed as a void function return type.
>
> Signed-off-by: Warner Losh <imp@bsdimp.com>
> ---
>  linux-user/signal-common.h | 4 ++--
>  linux-user/signal.c        | 5 ++---
>  2 files changed, 4 insertions(+), 5 deletions(-

This one's a dup of patch 3 from my series from Friday:
https://patchew.org/QEMU/20220114153732.3767229-1-peter.maydell@linaro.org/20220114153732.3767229-4-peter.maydell@linaro.org/


-- PMM