OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

trace: simple: pass trace_file unmodified to config-host.h

Browse Source 
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>
This commit is contained in:
Paolo Bonzini 2021-10-07 15:08:13 +02:00
parent 537b724899
commit 0955d66e65
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -4580,8 +4580,6 @@ if have_backend "nop"; then
fi fi
if have_backend "simple"; then if have_backend "simple"; then
echo "CONFIG_TRACE_SIMPLE=y" >> $config_host_mak echo "CONFIG_TRACE_SIMPLE=y" >> $config_host_mak
# Set the appropriate trace file.
trace_file="\"$trace_file-\" FMT_pid"
fi fi
if have_backend "log"; then if have_backend "log"; then
echo "CONFIG_TRACE_LOG=y" >> $config_host_mak echo "CONFIG_TRACE_LOG=y" >> $config_host_mak

2
meson.build
View File

@ -1571,7 +1571,7 @@ config_host_data.set('HAVE_BROKEN_SIZE_MAX', not cc.compiles('''
ignored = ['CONFIG_QEMU_INTERP_PREFIX'] # actually per-target ignored = ['CONFIG_QEMU_INTERP_PREFIX'] # actually per-target
arrays = ['CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BDRV_RO_WHITELIST'] 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 foreach k, v: config_host
if ignored.contains(k) if ignored.contains(k)
# do nothing # do nothing

2
trace/simple.c
View File

@ -364,7 +364,7 @@ void st_set_trace_file(const char *file)
if (!file) { if (!file) {
/* Type cast needed for Windows where getpid() returns an int. */ /* 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 { } else {
trace_file_name = g_strdup_printf("%s", file); trace_file_name = g_strdup_printf("%s", file);
} }