proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-06-15 09:01:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

qemu-log: Abstract out "print usage message about valid log categories"

Browse Source 
Abstract out the "print a human readable list of all the
valid log categories" functionality which is currently duplicated
in three separate places. (We leave the monitor.c help_cmd()
implementation as-is since it wants to send the message to
the monitor and add its own information.)

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>
This commit is contained in:
Peter Maydell 2013-02-11 16:41:21 +00:00 committed by Blue Swirl
parent 9a7e542429
commit 59a6fa6e67
5 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bsd-user/main.c
View File

@ -864,14 +864,10 @@ int main(int argc, char **argv)
qemu_set_log_filename(log_file); qemu_set_log_filename(log_file);
if (log_mask) { if (log_mask) {
int mask; int mask;
const CPULogItem *item;
mask = cpu_str_to_log_mask(log_mask); mask = cpu_str_to_log_mask(log_mask);
if (!mask) { if (!mask) {
printf("Log items (comma separated):\n"); qemu_print_log_usage(stdout);
for (item = cpu_log_items; item->mask != 0; item++) {
printf("%-10s %s\n", item->name, item->help);
}
exit(1); exit(1);
} }
cpu_set_log(mask); cpu_set_log(mask);

6
cpus.c
View File

@ -1178,14 +1178,10 @@ void set_numa_modes(void)
void set_cpu_log(const char *optarg) void set_cpu_log(const char *optarg)
{ {
int mask; int mask;
const CPULogItem *item;
mask = cpu_str_to_log_mask(optarg); mask = cpu_str_to_log_mask(optarg);
if (!mask) { if (!mask) {
printf("Log items (comma separated):\n"); qemu_print_log_usage(stdout);
for (item = cpu_log_items; item->mask != 0; item++) {
printf("%-10s %s\n", item->name, item->help);
}
exit(1); exit(1);
} }
cpu_set_log(mask); cpu_set_log(mask);

5
include/qemu/log.h
View File

@ -157,4 +157,9 @@ static inline void cpu_set_log(int log_flags)
void qemu_set_log_filename(const char *filename); void qemu_set_log_filename(const char *filename);
int cpu_str_to_log_mask(const char *str); 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 #endif

6
linux-user/main.c
View File

@ -3098,14 +3098,10 @@ static void handle_arg_help(const char *arg)
static void handle_arg_log(const char *arg) static void handle_arg_log(const char *arg)
{ {
int mask; int mask;
const CPULogItem *item;
mask = cpu_str_to_log_mask(arg); mask = cpu_str_to_log_mask(arg);
if (!mask) { if (!mask) {
printf("Log items (comma separated):\n"); qemu_print_log_usage(stdout);
for (item = cpu_log_items; item->mask != 0; item++) {
printf("%-10s %s\n", item->name, item->help);
}
exit(1); exit(1);
} }
cpu_set_log(mask); cpu_set_log(mask);

9
qemu-log.c
View File

@ -170,3 +170,12 @@ int cpu_str_to_log_mask(const char *str)
} }
return mask; 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);
}
}