浏览代码

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>
Paolo Bonzini 3 年之前
父节点
当前提交
0955d66e65
共有 3 个文件被更改,包括 2 次插入4 次删除
  1. 0 2
      configure
  2. 1 1
      meson.build
  3. 1 1
      trace/simple.c

+ 0 - 2
configure

@@ -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

+ 1 - 1
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
 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

+ 1 - 1
trace/simple.c

@@ -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);
     }
     }