Revision 7fe48483 monitor.c

b/monitor.c
101 101
    va_end(ap);
102 102
}
103 103

  
104
static int monitor_fprintf(FILE *stream, const char *fmt, ...)
105
{
106
    va_list ap;
107
    va_start(ap, fmt);
108
    term_vprintf(fmt, ap);
109
    va_end(ap);
110
    return 0;
111
}
112

  
104 113
static int compare_cmd(const char *name, const char *list)
105 114
{
106 115
    const char *p, *pstart;
......
206 215
static void do_info_registers(void)
207 216
{
208 217
#ifdef TARGET_I386
209
    cpu_dump_state(cpu_single_env, stdout, X86_DUMP_FPU | X86_DUMP_CCOP);
218
    cpu_dump_state(cpu_single_env, stdout, monitor_fprintf,
219
                   X86_DUMP_FPU | X86_DUMP_CCOP);
210 220
#else
211
    cpu_dump_state(cpu_single_env, stdout, 0);
221
    cpu_dump_state(cpu_single_env, stdout, monitor_fprintf, 
222
                   0);
212 223
#endif
213 224
}
214 225

  
......
1852 1863
            completion_index = strlen(str);
1853 1864
            bdrv_iterate(block_completion_it, (void *)str);
1854 1865
            break;
1866
        case 's':
1867
            /* XXX: more generic ? */
1868
            if (!strcmp(cmd->name, "info")) {
1869
                completion_index = strlen(str);
1870
                for(cmd = info_cmds; cmd->name != NULL; cmd++) {
1871
                    cmd_completion(str, cmd->name);
1872
                }
1873
            }
1874
            break;
1855 1875
        default:
1856 1876
            break;
1857 1877
        }

Also available in: Unified diff