diff options
| -rw-r--r-- | include/qemu/log.h | 6 | ||||
| -rw-r--r-- | monitor.c | 4 | ||||
| -rw-r--r-- | qemu-log.c | 12 |
3 files changed, 11 insertions, 11 deletions
diff --git a/include/qemu/log.h b/include/qemu/log.h index 5dcbe11d47..5a46555112 100644 --- a/include/qemu/log.h +++ b/include/qemu/log.h @@ -135,13 +135,13 @@ static inline void qemu_log_try_set_file(FILE *f) } /* define log items */ -typedef struct CPULogItem { +typedef struct QEMULogItem { int mask; const char *name; const char *help; -} CPULogItem; +} QEMULogItem; -extern const CPULogItem cpu_log_items[]; +extern const QEMULogItem qemu_log_items[]; /* This is the function that actually does the work of * changing the log level; it should only be accessed via @@ -721,10 +721,10 @@ static void help_cmd(Monitor *mon, const char *name) } else { help_cmd_dump(mon, mon_cmds, "", name); if (name && !strcmp(name, "log")) { - const CPULogItem *item; + const QEMULogItem *item; monitor_printf(mon, "Log items (comma separated):\n"); monitor_printf(mon, "%-10s %s\n", "none", "remove all logs"); - for(item = cpu_log_items; item->mask != 0; item++) { + for (item = qemu_log_items; item->mask != 0; item++) { monitor_printf(mon, "%-10s %s\n", item->name, item->help); } } diff --git a/qemu-log.c b/qemu-log.c index a96db882b3..2f47aafd24 100644 --- a/qemu-log.c +++ b/qemu-log.c @@ -97,7 +97,7 @@ void qemu_set_log_filename(const char *filename) qemu_set_log(qemu_loglevel); } -const CPULogItem cpu_log_items[] = { +const QEMULogItem qemu_log_items[] = { { CPU_LOG_TB_OUT_ASM, "out_asm", "show generated host assembly code for each compiled TB" }, { CPU_LOG_TB_IN_ASM, "in_asm", @@ -138,7 +138,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 qemu_str_to_log_mask(const char *str) { - const CPULogItem *item; + const QEMULogItem *item; int mask; const char *p, *p1; @@ -150,11 +150,11 @@ int qemu_str_to_log_mask(const char *str) p1 = p + strlen(p); } if (cmp1(p,p1-p,"all")) { - for (item = cpu_log_items; item->mask != 0; item++) { + for (item = qemu_log_items; item->mask != 0; item++) { mask |= item->mask; } } else { - for (item = cpu_log_items; item->mask != 0; item++) { + for (item = qemu_log_items; item->mask != 0; item++) { if (cmp1(p, p1 - p, item->name)) { goto found; } @@ -173,9 +173,9 @@ int qemu_str_to_log_mask(const char *str) void qemu_print_log_usage(FILE *f) { - const CPULogItem *item; + const QEMULogItem *item; fprintf(f, "Log items (comma separated):\n"); - for (item = cpu_log_items; item->mask != 0; item++) { + for (item = qemu_log_items; item->mask != 0; item++) { fprintf(f, "%-10s %s\n", item->name, item->help); } } |