mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

monitor: print the invalid char in error message

Browse Source 
It's more friendly to print which char is invalid to user, especially
when user tries to input a float value and expect the monitor to round
it to int. Since we don't round float number when we look for a integer,
telling which char is invalid is less confusing.

Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Fam Zheng 2013-08-20 10:58:21 +08:00 committed by Luiz Capitulino
parent 3953e3a5d3
commit 277acfe8b3
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
monitor.c
View File

@ -3171,9 +3171,13 @@ static const MonitorDef monitor_defs[] = {
{ NULL }, { NULL },
}; };
static void expr_error(Monitor *mon, const char *msg) static void expr_error(Monitor *mon, const char *fmt, ...)
{ {
monitor_printf(mon, "%s\n", msg); va_list ap;
va_start(ap, fmt);
monitor_vprintf(mon, fmt, ap);
monitor_printf(mon, "\n");
va_end(ap);
siglongjmp(expr_env, 1); siglongjmp(expr_env, 1);
} }
@ -3291,7 +3295,7 @@ static int64_t expr_unary(Monitor *mon)
expr_error(mon, "number too large"); expr_error(mon, "number too large");
} }
if (pch == p) { if (pch == p) {
expr_error(mon, "invalid char in expression"); expr_error(mon, "invalid char '%c' in expression", *p);
} }
pch = p; pch = p;
while (qemu_isspace(*pch)) while (qemu_isspace(*pch))