Add the suffix directly in trace/simple.c, so that quoting is done
properly by Meson.
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 2 --
meson.build | 2 +-
trace/simple.c | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index f5dfcf1a08..98723db0cd 100755
--- a/configure
+++ b/configure
@@ -4578,8 +4578,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 745b8c3c46..8752b757cc 100644
--- a/meson.build
+++ b/meson.build
@@ -1574,7 +1574,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);
}
--
2.31.1