aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bsd-user/main.c6
-rw-r--r--cpus.c6
-rw-r--r--include/qemu/log.h5
-rw-r--r--linux-user/main.c6
-rw-r--r--qemu-log.c9
5 files changed, 17 insertions, 15 deletions
diff --git a/bsd-user/main.c b/bsd-user/main.c
index 76ab35909c..26604b43cb 100644
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -864,14 +864,10 @@ int main(int argc, char **argv)
qemu_set_log_filename(log_file);
if (log_mask) {
int mask;
- const CPULogItem *item;
mask = cpu_str_to_log_mask(log_mask);
if (!mask) {
- printf("Log items (comma separated):\n");
- for (item = cpu_log_items; item->mask != 0; item++) {
- printf("%-10s %s\n", item->name, item->help);
- }
+ qemu_print_log_usage(stdout);
exit(1);
}
cpu_set_log(mask);
diff --git a/cpus.c b/cpus.c
index 2155441b35..0fdc48ca88 100644
--- a/cpus.c
+++ b/cpus.c
@@ -1178,14 +1178,10 @@ void set_numa_modes(void)
void set_cpu_log(const char *optarg)
{
int mask;
- const CPULogItem *item;
mask = cpu_str_to_log_mask(optarg);
if (!mask) {
- printf("Log items (comma separated):\n");
- for (item = cpu_log_items; item->mask != 0; item++) {
- printf("%-10s %s\n", item->name, item->help);
- }
+ qemu_print_log_usage(stdout);
exit(1);
}
cpu_set_log(mask);
diff --git a/include/qemu/log.h b/include/qemu/log.h
index 4760e04c5e..59511a3748 100644
--- a/include/qemu/log.h
+++ b/include/qemu/log.h
@@ -157,4 +157,9 @@ 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);
+/* Print a usage message listing all the valid logging categories
+ * to the specified FILE*.
+ */
+void qemu_print_log_usage(FILE *f);
+
#endif
diff --git a/linux-user/main.c b/linux-user/main.c
index 4beb5c9ae5..00b0125414 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -3098,14 +3098,10 @@ static void handle_arg_help(const char *arg)
static void handle_arg_log(const char *arg)
{
int mask;
- const CPULogItem *item;
mask = cpu_str_to_log_mask(arg);
if (!mask) {
- printf("Log items (comma separated):\n");
- for (item = cpu_log_items; item->mask != 0; item++) {
- printf("%-10s %s\n", item->name, item->help);
- }
+ qemu_print_log_usage(stdout);
exit(1);
}
cpu_set_log(mask);
diff --git a/qemu-log.c b/qemu-log.c
index 9a7e5675a1..786d335893 100644
--- a/qemu-log.c
+++ b/qemu-log.c
@@ -170,3 +170,12 @@ int cpu_str_to_log_mask(const char *str)
}
return mask;
}
+
+void qemu_print_log_usage(FILE *f)
+{
+ const CPULogItem *item;
+ fprintf(f, "Log items (comma separated):\n");
+ for (item = cpu_log_items; item->mask != 0; item++) {
+ fprintf(f, "%-10s %s\n", item->name, item->help);
+ }
+}