From 277acfe8b38de35be8cb6e274678b5a7919c2d44 Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Tue, 20 Aug 2013 10:58:21 +0800 Subject: monitor: print the invalid char in error message 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 Reviewed-by: Markus Armbruster Reviewed-by: Eric Blake Signed-off-by: Luiz Capitulino --- monitor.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'monitor.c') diff --git a/monitor.c b/monitor.c index 5dc0aa97f5..da9c9a222b 100644 --- a/monitor.c +++ b/monitor.c @@ -3171,9 +3171,13 @@ static const MonitorDef monitor_defs[] = { { 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); } @@ -3291,7 +3295,7 @@ static int64_t expr_unary(Monitor *mon) expr_error(mon, "number too large"); } if (pch == p) { - expr_error(mon, "invalid char in expression"); + expr_error(mon, "invalid char '%c' in expression", *p); } pch = p; while (qemu_isspace(*pch)) -- cgit v1.2.1