Commit 1e1c555a authored by Laszlo Ersek's avatar Laszlo Ersek Committed by Luiz Capitulino
Browse files

OptsVisitor: opts_type_int(): recognize intervals when LM_IN_PROGRESS 



When a well-formed range value, bounded by signed integers, is encountered
while processing a repeated option, enter LM_SIGNED_INTERVAL and return
the low bound.

Signed-off-by: default avatarLaszlo Ersek <lersek@redhat.com>
Tested-by: default avatarWanlong Gao <gaowanlong@cn.fujitsu.com>
Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent d8754f40

qapi/opts-visitor.c

+28 −6
Original line number Diff line number Diff line
@@ -367,15 +367,37 @@ opts_type_int(Visitor *v, int64_t *obj, const char *name, Error **errp) 
    }

    str = opt->str ? opt->str : "";



    /* we've gotten past lookup_scalar() */

    assert(ov->list_mode == LM_NONE || ov->list_mode == LM_IN_PROGRESS);



    errno = 0;

    val = strtoll(str, &endptr, 0);

    if (*str != '\0' && *endptr == '\0' && errno == 0 && INT64_MIN <= val &&

        val <= INT64_MAX) {

    if (errno == 0 && endptr > str && INT64_MIN <= val && val <= INT64_MAX) {

        if (*endptr == '\0') {

            *obj = val;

            processed(ov, name);

            return;

        }

    error_set(errp, QERR_INVALID_PARAMETER_VALUE, opt->name, "an int64 value");

        if (*endptr == '-' && ov->list_mode == LM_IN_PROGRESS) {

            long long val2;



            str = endptr + 1;

            val2 = strtoll(str, &endptr, 0);

            if (errno == 0 && endptr > str && *endptr == '\0' &&

                INT64_MIN <= val2 && val2 <= INT64_MAX && val <= val2) {

                ov->range_next.s = val;

                ov->range_limit.s = val2;

                ov->list_mode = LM_SIGNED_INTERVAL;



                /* as if entering on the top */

                *obj = ov->range_next.s;

                return;

            }

        }

    }

    error_set(errp, QERR_INVALID_PARAMETER_VALUE, opt->name,

              (ov->list_mode == LM_NONE) ? "an int64 value" :

                                           "an int64 value or range");

}