From 4fde1eba0f98779d4fdb64818071f72bb1672438 Mon Sep 17 00:00:00 2001
From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 11 Feb 2013 16:41:22 +0000
Subject: [PATCH] qemu-log: Rename cpu_str_to_log_mask to qemu_str_to_log_mask
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
Rename cpu_str_to_log_mask() to qemu_str_to_log_mask(), since
the qemu_log functionality is no longer restricted to TCG CPU
debug logging.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---
bsd-user/main.c | 2 +-
cpus.c | 2 +-
include/qemu/log.h | 2 +-
linux-user/main.c | 2 +-
monitor.c | 2 +-
qemu-log.c | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/bsd-user/main.c b/bsd-user/main.c
index 26604b43cb..4b12e655b1 100644
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -865,7 +865,7 @@ int main(int argc, char **argv)
if (log_mask) {
int mask;
- mask = cpu_str_to_log_mask(log_mask);
+ mask = qemu_str_to_log_mask(log_mask);
if (!mask) {
qemu_print_log_usage(stdout);
exit(1);
diff --git a/cpus.c b/cpus.c
index 0fdc48ca88..63cfb73613 100644
--- a/cpus.c
+++ b/cpus.c
@@ -1179,7 +1179,7 @@ void set_cpu_log(const char *optarg)
{
int mask;
- mask = cpu_str_to_log_mask(optarg);
+ mask = qemu_str_to_log_mask(optarg);
if (!mask) {
qemu_print_log_usage(stdout);
exit(1);
diff --git a/include/qemu/log.h b/include/qemu/log.h
index 59511a3748..10792ce0d1 100644
--- a/include/qemu/log.h
+++ b/include/qemu/log.h
@@ -155,7 +155,7 @@ static inline void cpu_set_log(int log_flags)
}
void qemu_set_log_filename(const char *filename);
-int cpu_str_to_log_mask(const char *str);
+int qemu_str_to_log_mask(const char *str);
/* Print a usage message listing all the valid logging categories
* to the specified FILE*.
diff --git a/linux-user/main.c b/linux-user/main.c
index 00b0125414..862619b438 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -3099,7 +3099,7 @@ static void handle_arg_log(const char *arg)
{
int mask;
- mask = cpu_str_to_log_mask(arg);
+ mask = qemu_str_to_log_mask(arg);
if (!mask) {
qemu_print_log_usage(stdout);
exit(1);
diff --git a/monitor.c b/monitor.c
index 578a31803f..2a55d56686 100644
--- a/monitor.c
+++ b/monitor.c
@@ -975,7 +975,7 @@ static void do_log(Monitor *mon, const QDict *qdict)
if (!strcmp(items, "none")) {
mask = 0;
} else {
- mask = cpu_str_to_log_mask(items);
+ mask = qemu_str_to_log_mask(items);
if (!mask) {
help_cmd(mon, "log");
return;
diff --git a/qemu-log.c b/qemu-log.c
index 786d335893..10a8581f1f 100644
--- a/qemu-log.c
+++ b/qemu-log.c
@@ -136,7 +136,7 @@ static int cmp1(const char *s1, int n, const char *s2)
}
/* takes a comma separated list of log masks. Return 0 if error. */
-int cpu_str_to_log_mask(const char *str)
+int qemu_str_to_log_mask(const char *str)
{
const CPULogItem *item;
int mask;
--
2.30.2