On Tue, 20 Aug 2013 10:58:21 +0800 Fam Zheng <[email protected]> wrote:
> 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 <[email protected]> Applied to the qmp branch, thanks. > --- > monitor.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/monitor.c b/monitor.c > index 5dc0aa9..da9c9a2 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))
