Patchwork Re: [PATCH 0/4] Fix printf calls embedding preprocessor directives

login
register
mail settings
Submitter Sheng Yang
Date Feb. 5, 2010, 2:26 a.m.
Message ID <201002051026.10614.sheng@linux.intel.com>
Download mbox | patch
Permalink /patch/44604/
State New
Headers show

Comments

Sheng Yang - Feb. 5, 2010, 2:26 a.m.
On Thursday 04 February 2010 23:49:55 Paolo Bonzini wrote:
> Patch 1 is the same I sent earlier.  Patches 2 and 3/4 fix the
> other two problems by Sheng (tip: next time use "make -k" and
> report all problems in a single message).
> 
> Paolo Bonzini (4):
>   qemu-img: avoid preprocessor directives in a printf call
>   cope with printf macro definition in readline.c
>   do not interpolate % from vl.c to qemu-options.h
>   vl.c: avoid preprocessor directives in a printf call
> 
>  qemu-img.c      |    9 +++++----
>  qemu-options.hx |   15 ++++++++-------
>  readline.c      |    1 +
>  vl.c            |   23 +++++++++--------------
>  4 files changed, 23 insertions(+), 25 deletions(-)
> 
Works fine with me. Thanks. :)

But:

Is it proper to remove #ifndef _WIN32 there?
Kevin Wolf - Feb. 5, 2010, 8:30 a.m.
Am 05.02.2010 03:26, schrieb Sheng Yang:
> On Thursday 04 February 2010 23:49:55 Paolo Bonzini wrote:
>> Patch 1 is the same I sent earlier.  Patches 2 and 3/4 fix the
>> other two problems by Sheng (tip: next time use "make -k" and
>> report all problems in a single message).
>>
>> Paolo Bonzini (4):
>>   qemu-img: avoid preprocessor directives in a printf call
>>   cope with printf macro definition in readline.c
>>   do not interpolate % from vl.c to qemu-options.h
>>   vl.c: avoid preprocessor directives in a printf call
>>
>>  qemu-img.c      |    9 +++++----
>>  qemu-options.hx |   15 ++++++++-------
>>  readline.c      |    1 +
>>  vl.c            |   23 +++++++++--------------
>>  4 files changed, 23 insertions(+), 25 deletions(-)
>>
> Works fine with me. Thanks. :)
> 
> But:
> 
> diff --git a/vl.c b/vl.c
> index 39833fc..3d2de7b 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -4041,14 +4041,7 @@ static void help(int exitcode)
>             "\n"
>             "When using -nographic, press 'ctrl-a h' to get some help.\n"
>             ,
> -           "qemu",
> -           DEFAULT_RAM_SIZE,
> -#ifndef _WIN32
> -           DEFAULT_NETWORK_SCRIPT,
> -           DEFAULT_NETWORK_DOWN_SCRIPT,
> -#endif
> -           DEFAULT_GDBSTUB_PORT,
> -           "/tmp/qemu.log");
> +           "qemu");
>      exit(exitcode);
>  }
> 
> Is it proper to remove #ifndef _WIN32 there?

These lines are only moved into another #ifdef (in qemu-options.hx), so
this looks right to me.

Kevin
Paolo Bonzini - Feb. 5, 2010, 8:47 a.m.
On 02/05/2010 03:26 AM, Sheng Yang wrote:
> -#ifndef _WIN32
> -           DEFAULT_NETWORK_SCRIPT,
> -           DEFAULT_NETWORK_DOWN_SCRIPT,
> -#endif
> -           DEFAULT_GDBSTUB_PORT,
> -           "/tmp/qemu.log");
> +           "qemu");
>       exit(exitcode);
>   }
>
> Is it proper to remove #ifndef _WIN32 there?

Yes, this matched a #ifndef in qemu-options.hx that remains there.

Paolo

Patch

diff --git a/vl.c b/vl.c
index 39833fc..3d2de7b 100644
--- a/vl.c
+++ b/vl.c
@@ -4041,14 +4041,7 @@  static void help(int exitcode)
            "\n"
            "When using -nographic, press 'ctrl-a h' to get some help.\n"
            ,
-           "qemu",
-           DEFAULT_RAM_SIZE,
-#ifndef _WIN32
-           DEFAULT_NETWORK_SCRIPT,
-           DEFAULT_NETWORK_DOWN_SCRIPT,
-#endif
-           DEFAULT_GDBSTUB_PORT,
-           "/tmp/qemu.log");
+           "qemu");
     exit(exitcode);
 }