[Qemu-devel] [PATCH] darwin-user: Fix format string in debug message

[Qemu-devel] [PATCH] darwin-user: Fix format string in debug message

[Stefan Weil]

This was spotted by cppcheck.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 darwin-user/signal.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/darwin-user/signal.c b/darwin-user/signal.c
index c530227..317ef92 100644
--- a/darwin-user/signal.c
+++ b/darwin-user/signal.c
@@ -270,8 +270,7 @@ int do_sigaction(int sig, const struct sigaction *act,
         host_sig = target_to_host_signal(sig);
         if (host_sig != SIGSEGV && host_sig != SIGBUS) {
 #if defined(DEBUG_SIGNAL)
-    fprintf(stderr, "sigaction handler going to call sigaction\n",
-            act->sa_handler, act->sa_flags, act->sa_mask);
+            fprintf(stderr, "sigaction handler going to call sigaction\n");
 #endif
 
             sigfillset(&act1.sa_mask);
-- 
1.7.2.5

Re: [Qemu-devel] [PATCH] darwin-user: Fix format string in debug message

[Andreas Färber]

Am 19.11.2011 20:18, schrieb Stefan Weil:
> This was spotted by cppcheck.
> 
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>  darwin-user/signal.c |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/darwin-user/signal.c b/darwin-user/signal.c
> index c530227..317ef92 100644
> --- a/darwin-user/signal.c
> +++ b/darwin-user/signal.c
> @@ -270,8 +270,7 @@ int do_sigaction(int sig, const struct sigaction *act,
>          host_sig = target_to_host_signal(sig);
>          if (host_sig != SIGSEGV && host_sig != SIGBUS) {
>  #if defined(DEBUG_SIGNAL)
> -    fprintf(stderr, "sigaction handler going to call sigaction\n",
> -            act->sa_handler, act->sa_flags, act->sa_mask);
> +            fprintf(stderr, "sigaction handler going to call sigaction\n");
>  #endif
>  
>              sigfillset(&act1.sa_mask);

Is the debug output really useful without the information? Maybe rather
append %p %x %x? What does linux-user do?

Andreas

Re: [Qemu-devel] [PATCH] darwin-user: Fix format string in debug message

[Peter Maydell]

On 21 November 2011 13:32, Andreas Färber <andreas.faerber@web.de> wrote:
> Is the debug output really useful without the information? Maybe rather
> append %p %x %x? What does linux-user do?

linux-user doesn't print any debug output at this point.

Incidentally, I'm increasingly of the opinion that the various minor
foo-user subtrees would be better off merged into a single user tree:
there is a steady stream of minor bugfixes/feature improvements that
go into linux-user that don't get into the others...

-- PMM

Re: [Qemu-devel] [Qemu-trivial] [PATCH] darwin-user: Fix format string in debug message

[Stefan Hajnoczi]

On Sat, Nov 19, 2011 at 08:18:39PM +0100, Stefan Weil wrote:
> This was spotted by cppcheck.
> 
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>  darwin-user/signal.c |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)

I am waiting to see if you send a v2 or this thread continues.  Not
applied to trivial-patches.

Stefan

Re: [Qemu-devel] [Qemu-trivial] [PATCH] darwin-user: Fix format string in debug message

[Peter Maydell]

On 22 November 2011 10:43, Stefan Hajnoczi <stefanha@gmail.com> wrote:
> On Sat, Nov 19, 2011 at 08:18:39PM +0100, Stefan Weil wrote:
>> This was spotted by cppcheck.
>>
>> Signed-off-by: Stefan Weil <sw@weilnetz.de>
>> ---
>>  darwin-user/signal.c |    3 +--
>>  1 files changed, 1 insertions(+), 2 deletions(-)
>
> I am waiting to see if you send a v2 or this thread continues.  Not
> applied to trivial-patches.

FWIW I think the patch as it is is fine. We have already printed
sa_handler &c in the immediately preceding line of debug output so
there's nothing gained from printing them again; probably it was
a stray cut-n-paste error in the first place.

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

-- PMM

Re: [Qemu-devel] [Qemu-trivial] [PATCH] darwin-user: Fix format string in debug message

[Stefan Hajnoczi]

On Sat, Nov 19, 2011 at 08:18:39PM +0100, Stefan Weil wrote:
> This was spotted by cppcheck.
> 
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>  darwin-user/signal.c |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)

Thanks, applied to the trivial patches -next tree:
http://repo.or.cz/w/qemu/stefanha.git/shortlog/refs/heads/trivial-patches-next

Stefan