On 05/15/2012 03:31 PM, Andreas Färber wrote:
> Am 15.05.2012 11:39, schrieb Fabien Chouteau:
>> Do not call cpu_dump_state if logfile is NULL.
>
> And where is log_cpu_state() being called from? Its caller is passing
> NULL already then.
>
No, logfile is a global variable. log_cpu_state() takes only CPUState
and flags parameters.
>>
>> Signed-off-by: Fabien Chouteau <chout...@adacore.com>
>> ---
>> qemu-log.h | 7 ++++++-
>> 1 file changed, 6 insertions(+), 1 deletion(-)
>>
>> diff --git a/qemu-log.h b/qemu-log.h
>> index fccfb110..2cd5ffa 100644
>> --- a/qemu-log.h
>> +++ b/qemu-log.h
>> @@ -51,7 +51,12 @@ extern int loglevel;
>> /* Special cases: */
>>
>> /* cpu_dump_state() logging functions: */
>> -#define log_cpu_state(env, f) cpu_dump_state((env), logfile, fprintf, (f));
>> +#define log_cpu_state(env, f) \
>> +do { \
>> + if (logfile != NULL) { \
>> + cpu_dump_state((env), logfile, fprintf, (f)); \
>> + } \
>> + } while (0)
>> #define log_cpu_state_mask(b, env, f) do { \
>> if (loglevel & (b)) log_cpu_state((env), (f)); \
>> } while (0)
>
--
Fabien Chouteau
