[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/6] qemu-log: Rename cpu_str_to_log_mask to qemu_st
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 3/6] qemu-log: Rename cpu_str_to_log_mask to qemu_str_to_log_mask |
Date: |
Mon, 11 Feb 2013 16:41:22 +0000 |
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 <address@hidden>
---
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 26604b4..4b12e65 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 0fdc48c..63cfb73 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 59511a3..10792ce 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 81eb126..5257552 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 578a318..2a55d56 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 786d335..10a8581 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;
--
1.7.9.5
- [Qemu-devel] [PATCH 0/6] qemu_log: remove 'cpu' from qemu log function names, Peter Maydell, 2013/02/11
- [Qemu-devel] [PATCH 3/6] qemu-log: Rename cpu_str_to_log_mask to qemu_str_to_log_mask,
Peter Maydell <=
- [Qemu-devel] [PATCH 1/6] qemu-log: Unify {cpu_set, set_cpu}_log_filename as qemu_set_log_filename, Peter Maydell, 2013/02/11
- [Qemu-devel] [PATCH 2/6] qemu-log: Abstract out "print usage message about valid log categories", Peter Maydell, 2013/02/11
- [Qemu-devel] [PATCH 4/6] qemu-log: Rename the public-facing cpu_set_log function to qemu_set_log, Peter Maydell, 2013/02/11
- [Qemu-devel] [PATCH 6/6] qemu-log: Rename CPULogItem, cpu_log_items to QEMULogItem, qemu_log_items, Peter Maydell, 2013/02/11