summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bsd-user/main.c2
-rw-r--r--cpus.c2
-rw-r--r--hw/ppc.c2
-rw-r--r--include/qemu/log.h12
-rw-r--r--linux-user/main.c2
-rw-r--r--monitor.c2
-rw-r--r--qemu-log.c4
-rw-r--r--target-i386/translate.c2
-rw-r--r--tcg/tci/tcg-target.c2
9 files changed, 17 insertions, 13 deletions
diff --git a/bsd-user/main.c b/bsd-user/main.c
index 4b12e655b1..097fbfe432 100644
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -870,7 +870,7 @@ int main(int argc, char **argv)
qemu_print_log_usage(stdout);
exit(1);
}
- cpu_set_log(mask);
+ qemu_set_log(mask);
}
if (optind >= argc) {
diff --git a/cpus.c b/cpus.c
index 63cfb73613..24e6affbf7 100644
--- a/cpus.c
+++ b/cpus.c
@@ -1184,7 +1184,7 @@ void set_cpu_log(const char *optarg)
qemu_print_log_usage(stdout);
exit(1);
}
- cpu_set_log(mask);
+ qemu_set_log(mask);
}
void list_cpus(FILE *f, fprintf_function cpu_fprintf, const char *optarg)
diff --git a/hw/ppc.c b/hw/ppc.c
index c52e22f708..6053bd5652 100644
--- a/hw/ppc.c
+++ b/hw/ppc.c
@@ -1189,7 +1189,7 @@ void PPC_debug_write (void *opaque, uint32_t addr, uint32_t val)
break;
case 2:
printf("Set loglevel to %04" PRIx32 "\n", val);
- cpu_set_log(val | 0x100);
+ qemu_set_log(val | 0x100);
break;
}
}
diff --git a/include/qemu/log.h b/include/qemu/log.h
index 10792ce0d1..5dcbe11d47 100644
--- a/include/qemu/log.h
+++ b/include/qemu/log.h
@@ -143,14 +143,18 @@ typedef struct CPULogItem {
extern const CPULogItem cpu_log_items[];
-void qemu_set_log(int log_flags, bool use_own_buffers);
+/* This is the function that actually does the work of
+ * changing the log level; it should only be accessed via
+ * the qemu_set_log() wrapper.
+ */
+void do_qemu_set_log(int log_flags, bool use_own_buffers);
-static inline void cpu_set_log(int log_flags)
+static inline void qemu_set_log(int log_flags)
{
#ifdef CONFIG_USER_ONLY
- qemu_set_log(log_flags, true);
+ do_qemu_set_log(log_flags, true);
#else
- qemu_set_log(log_flags, false);
+ do_qemu_set_log(log_flags, false);
#endif
}
diff --git a/linux-user/main.c b/linux-user/main.c
index 862619b438..146a4683a5 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -3104,7 +3104,7 @@ static void handle_arg_log(const char *arg)
qemu_print_log_usage(stdout);
exit(1);
}
- cpu_set_log(mask);
+ qemu_set_log(mask);
}
static void handle_arg_log_filename(const char *arg)
diff --git a/monitor.c b/monitor.c
index 2a55d56686..6aac4c20bd 100644
--- a/monitor.c
+++ b/monitor.c
@@ -981,7 +981,7 @@ static void do_log(Monitor *mon, const QDict *qdict)
return;
}
}
- cpu_set_log(mask);
+ qemu_set_log(mask);
}
static void do_singlestep(Monitor *mon, const QDict *qdict)
diff --git a/qemu-log.c b/qemu-log.c
index 10a8581f1f..a96db882b3 100644
--- a/qemu-log.c
+++ b/qemu-log.c
@@ -54,7 +54,7 @@ void qemu_log_mask(int mask, const char *fmt, ...)
}
/* enable or disable low levels log */
-void qemu_set_log(int log_flags, bool use_own_buffers)
+void do_qemu_set_log(int log_flags, bool use_own_buffers)
{
const char *fname = logfilename ?: DEFAULT_LOGFILENAME;
@@ -94,7 +94,7 @@ void qemu_set_log_filename(const char *filename)
fclose(qemu_logfile);
qemu_logfile = NULL;
}
- cpu_set_log(qemu_loglevel);
+ qemu_set_log(qemu_loglevel);
}
const CPULogItem cpu_log_items[] = {
diff --git a/target-i386/translate.c b/target-i386/translate.c
index 32d21f52d0..112c3102a0 100644
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -6854,7 +6854,7 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s,
#else
/* start debug */
tb_flush(env);
- cpu_set_log(CPU_LOG_INT | CPU_LOG_TB_IN_ASM);
+ qemu_set_log(CPU_LOG_INT | CPU_LOG_TB_IN_ASM);
#endif
break;
#endif
diff --git a/tcg/tci/tcg-target.c b/tcg/tci/tcg-target.c
index 1707169ea8..2d561b32e1 100644
--- a/tcg/tci/tcg-target.c
+++ b/tcg/tci/tcg-target.c
@@ -888,7 +888,7 @@ static void tcg_target_init(TCGContext *s)
#if defined(CONFIG_DEBUG_TCG_INTERPRETER)
const char *envval = getenv("DEBUG_TCG");
if (envval) {
- cpu_set_log(strtol(envval, NULL, 0));
+ qemu_set_log(strtol(envval, NULL, 0));
}
#endif