ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OptsVisitor: opts_type_uint64(): recognize intervals when LM_IN_PROGRESS 

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

Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Laszlo Ersek 2013-08-20 00:35:37 +02:00 committed by Luiz Capitulino
parent 62d090e23f
commit 581a8a8000
1 changed files with 27 additions and 5 deletions

32
qapi/opts-visitor.c
View File

@ -408,6 +408,7 @@ opts_type_uint64(Visitor *v, uint64_t *obj, const char *name, Error **errp)
const QemuOpt *opt; const QemuOpt *opt;
const char *str; const char *str;
unsigned long long val; unsigned long long val;
char *endptr;
if (ov->list_mode == LM_UNSIGNED_INTERVAL) { if (ov->list_mode == LM_UNSIGNED_INTERVAL) {
*obj = ov->range_next.u; *obj = ov->range_next.u;
@ -420,13 +421,34 @@ opts_type_uint64(Visitor *v, uint64_t *obj, const char *name, Error **errp)
} }
str = opt->str; str = opt->str;
if (parse_uint_full(str, &val, 0) == 0 && val <= UINT64_MAX) { /* we've gotten past lookup_scalar() */
*obj = val; assert(ov->list_mode == LM_NONE || ov->list_mode == LM_IN_PROGRESS);
processed(ov, name);
return; if (parse_uint(str, &val, &endptr, 0) == 0 && val <= UINT64_MAX) {
if (*endptr == '\0') {
*obj = val;
processed(ov, name);
return;
}
if (*endptr == '-' && ov->list_mode == LM_IN_PROGRESS) {
unsigned long long val2;
str = endptr + 1;
if (parse_uint_full(str, &val2, 0) == 0 &&
val2 <= UINT64_MAX && val <= val2) {
ov->range_next.u = val;
ov->range_limit.u = val2;
ov->list_mode = LM_UNSIGNED_INTERVAL;
/* as if entering on the top */
*obj = ov->range_next.u;
return;
}
}
} }
error_set(errp, QERR_INVALID_PARAMETER_VALUE, opt->name, error_set(errp, QERR_INVALID_PARAMETER_VALUE, opt->name,
"an uint64 value"); (ov->list_mode == LM_NONE) ? "a uint64 value" :
"a uint64 value or range");
} }