diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2021-10-07 15:08:13 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-10-14 09:50:56 +0200 |
| commit | 0955d66e65e68580021a99960581422e93c127d4 (patch) | |
| tree | 6763b028ac5542616cad3ae6640a8117f1295cea | |
| parent | 537b7248991b85d1fb92cce78ecf1056f40bb750 (diff) | |
trace: simple: pass trace_file unmodified to config-host.h
Add the suffix directly in trace/simple.c, so that quoting is done
properly by Meson.
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20211007130829.632254-3-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | trace/simple.c | 2 |
3 files changed, 2 insertions, 4 deletions
@@ -4580,8 +4580,6 @@ if have_backend "nop"; then fi if have_backend "simple"; then echo "CONFIG_TRACE_SIMPLE=y" >> $config_host_mak - # Set the appropriate trace file. - trace_file="\"$trace_file-\" FMT_pid" fi if have_backend "log"; then echo "CONFIG_TRACE_LOG=y" >> $config_host_mak diff --git a/meson.build b/meson.build index a3424bce7d..5418083db7 100644 --- a/meson.build +++ b/meson.build @@ -1571,7 +1571,7 @@ config_host_data.set('HAVE_BROKEN_SIZE_MAX', not cc.compiles(''' ignored = ['CONFIG_QEMU_INTERP_PREFIX'] # actually per-target arrays = ['CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BDRV_RO_WHITELIST'] -strings = ['HOST_DSOSUF', 'CONFIG_IASL'] +strings = ['HOST_DSOSUF', 'CONFIG_IASL', 'CONFIG_TRACE_FILE'] foreach k, v: config_host if ignored.contains(k) # do nothing diff --git a/trace/simple.c b/trace/simple.c index ac499edee0..18af590cf7 100644 --- a/trace/simple.c +++ b/trace/simple.c @@ -364,7 +364,7 @@ void st_set_trace_file(const char *file) if (!file) { /* Type cast needed for Windows where getpid() returns an int. */ - trace_file_name = g_strdup_printf(CONFIG_TRACE_FILE, (pid_t)getpid()); + trace_file_name = g_strdup_printf(CONFIG_TRACE_FILE "-" FMT_pid, (pid_t)getpid()); } else { trace_file_name = g_strdup_printf("%s", file); } |