[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/26] trace: simple: pass trace_file unmodified to config-host.h
From: |
Paolo Bonzini |
Subject: |
[PULL 08/26] trace: simple: pass trace_file unmodified to config-host.h |
Date: |
Thu, 14 Oct 2021 18:29:20 +0200 |
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>
---
configure | 2 --
meson.build | 2 +-
trace/simple.c | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index a9a424948c..c27c4d6f1c 100755
--- a/configure
+++ b/configure
@@ -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);
}
--
2.31.1
- [PULL 00/26] Meson changes for 2021-10-14, Paolo Bonzini, 2021/10/14
- [PULL 02/26] audio: remove CONFIG_AUDIO_WIN_INT, Paolo Bonzini, 2021/10/14
- [PULL 05/26] configure: add command line options for audio drivers, Paolo Bonzini, 2021/10/14
- [PULL 06/26] kconfig: split CONFIG_SPARSE_MEM from fuzzing, Paolo Bonzini, 2021/10/14
- [PULL 01/26] configure: remove --oss-lib, Paolo Bonzini, 2021/10/14
- [PULL 04/26] meson: define symbols for all available audio drivers, Paolo Bonzini, 2021/10/14
- [PULL 03/26] configure, meson: move audio driver detection to Meson, Paolo Bonzini, 2021/10/14
- [PULL 10/26] configure, meson: move CONFIG_HOST_DSOSUF to Meson, Paolo Bonzini, 2021/10/14
- [PULL 08/26] trace: simple: pass trace_file unmodified to config-host.h,
Paolo Bonzini <=
- [PULL 07/26] configure, meson: move fuzzing configuration to Meson, Paolo Bonzini, 2021/10/14
- [PULL 09/26] trace: move configuration from configure to Meson, Paolo Bonzini, 2021/10/14
- [PULL 11/26] configure, meson: get HOST_WORDS_BIGENDIAN via the machine object, Paolo Bonzini, 2021/10/14
- [PULL 12/26] configure, meson: remove CONFIG_GCOV from config-host.mak, Paolo Bonzini, 2021/10/14
- [PULL 14/26] configure, meson: move remaining HAVE_* compiler tests to Meson, Paolo Bonzini, 2021/10/14
- [PULL 13/26] meson: HAVE_GDB_BIN is not used by C code, Paolo Bonzini, 2021/10/14
- [PULL 16/26] configure, meson: move libaio check to meson.build, Paolo Bonzini, 2021/10/14
- [PULL 15/26] configure, meson: move pthread_setname_np checks to Meson, Paolo Bonzini, 2021/10/14
- [PULL 17/26] configure, meson: move vde detection to meson, Paolo Bonzini, 2021/10/14
- [PULL 23/26] configure: accept "internal" for --enable-capstone/slirp/fdt, Paolo Bonzini, 2021/10/14