trace/simple: Fix unauthorized enable
PATCH v2 1/1 trace/simple: Fix unauthorized enable
st_set_trace_file() accidentally enables tracing. It's called unconditionally during startup, which is why QEMU built with the simple trace backend always writes a trace file "trace-$PID".
This has been broken for quite a while. I didn't track down the exact commit.
Fix st_set_trace_file() to restore the state.
---
v2: Make st_set_trace_file() less confusing [Stefan]
trace/simple.h | 2 +- trace/simple.c | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-)
trace/simple.h +1 -1
@@ -12,7 +12,7 @@#define TRACE_SIMPLE_H void st_print_trace_file_status (void ); -void st_set_trace_file_enabled (bool enable); +bool st_set_trace_file_enabled (bool enable);void st_set_trace_file (const char *file);bool st_init (void );void st_flush_trace_buffer (void );
trace/simple.c +14 -6
@@ -302,10 +302,17 @@ static int st_write_event_mapping(void)return 0 ; } -void st_set_trace_file_enabled (bool enable) +/** +* Enable / disable tracing, return whether it was enabled. +* +* @enable: enable if %true, else disable. +*/ +bool st_set_trace_file_enabled (bool enable) { +bool was_enabled = trace_fp; +if (enable == !!trace_fp) { -return ;/* no change */ +return was_enabled;/* no change */ }/* Halt trace writeout */
@@ -323,14 +330,14 @@ void st_set_trace_file_enabled(bool enable) trace_fp =fopen (trace_file_name,"wb" );if (!trace_fp) { -return ; +return was_enabled; }if (fwrite (&header,sizeof header,1 , trace_fp) !=1 ||st_write_event_mapping () <0 ) {fclose (trace_fp); trace_fp =NULL ; -return ; +return was_enabled; }/* Resume trace writeout */
@@ -340,6 +347,7 @@ void st_set_trace_file_enabled(bool enable)fclose (trace_fp); trace_fp =NULL ; } +return was_enabled; }/**
@@ -350,7 +358,7 @@ void st_set_trace_file_enabled(bool enable)*/ void st_set_trace_file (const char *file) { -st_set_trace_file_enabled (false); +bool saved_enable =st_set_trace_file_enabled (false);g_free (trace_file_name);
@@ -361,7 +369,7 @@ void st_set_trace_file(const char *file) trace_file_name =g_strdup_printf ("%s" , file); } -st_set_trace_file_enabled (true); +st_set_trace_file_enabled (saved_enable); }void st_print_trace_file_status (void )
Signature · 1 line
2.21.3
Quoted 90 lines · Markus Armbruster
st_set_trace_file()accidentally enables tracing. It's called unconditionally during startup, which is why QEMU built with the simple trace backend always writes a trace file "trace-$PID".This has been broken for quite a while. I didn't track down the exact commit.
Fix
st_set_trace_file()to restore the state.Signed-off-by Markus Armbruster <[email protected]>---
v2: Makest_set_trace_file()less confusing [Stefan]trace/simple.h | 2 +- trace/simple.c | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-)trace/simple.h +1
-1@@ -12,7 +12,7 @@#define TRACE_SIMPLE_H void st_print_trace_file_status (void ); -void st_set_trace_file_enabled (bool enable); +bool st_set_trace_file_enabled (bool enable);void st_set_trace_file (const char *file);bool st_init (void );void st_flush_trace_buffer (void );trace/simple.c +13
-5@@ -302,10 +302,17 @@ static int st_write_event_mapping(void)return 0 ; } -void st_set_trace_file_enabled (bool enable) +/** +* Enable / disable tracing, return whether it was enabled. +* +* @enable: enable if %true, else disable. +*/ +bool st_set_trace_file_enabled (bool enable) { +bool was_enabled = trace_fp; +if (enable == !!trace_fp) { -return ;/* no change */ +return was_enabled;/* no change */ }/* Halt trace writeout */ @@ -323,14 +330,14 @@ void st_set_trace_file_enabled(bool enable) trace_fp =fopen (trace_file_name,"wb" );if (!trace_fp) { -return ; +return was_enabled; }if (fwrite (&header,sizeof header,1 , trace_fp) !=1 ||st_write_event_mapping () <0 ) {fclose (trace_fp); trace_fp =NULL ; -return ; +return was_enabled; }/* Resume trace writeout */ @@ -340,6 +347,7 @@ void st_set_trace_file_enabled(bool enable)fclose (trace_fp); trace_fp =NULL ; } +return was_enabled; }/** @@ -350,7 +358,7 @@ void st_set_trace_file_enabled(bool enable)*/ void st_set_trace_file (const char *file) { -st_set_trace_file_enabled (false); +bool saved_enable =st_set_trace_file_enabled (false);g_free (trace_file_name);
trace/simple.c void st_set_trace_file(const char *file) · line 375
Quoted 8 lines
trace/simple.c +1
-1@@ -361,7 +369,7 @@ void st_set_trace_file(const char *file) trace_file_name =g_strdup_printf ("%s" , file); } -st_set_trace_file_enabled (true); +st_set_trace_file_enabled (saved_enable); }void st_print_trace_file_status (void )
Stefan Hajnoczi
AppliedQuoted 9 lines · Markus Armbruster
st_set_trace_file()accidentally enables tracing. It's called unconditionally during startup, which is why QEMU built with the simple trace backend always writes a trace file "trace-$PID".This has been broken for quite a while. I didn't track down the exact commit.
Fix
st_set_trace_file()to restore the state.
Quoted 7 lines
Signed-off-by Markus Armbruster <[email protected]>---
v2: Makest_set_trace_file()less confusing [Stefan]trace/simple.h | 2 +- trace/simple.c | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-)
Thanks, applied to my tracing tree:
https://github.com/stefanha/qemu/commits/tracing
Stefan