Commit 277acfe8 authored by Fam Zheng's avatar Fam Zheng Committed by Luiz Capitulino
Browse files

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: default avatarFam Zheng <famz@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent 3953e3a5

monitor.c

+7 −3
Original line number Diff line number Diff line
@@ -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))