[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/11] OptsVisitor: opts_type_int(): recognize interv
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PULL 04/11] OptsVisitor: opts_type_int(): recognize intervals when LM_IN_PROGRESS |
Date: |
Tue, 20 Aug 2013 12:10:34 -0400 |
From: Laszlo Ersek <address@hidden>
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: Laszlo Ersek <address@hidden>
Tested-by: Wanlong Gao <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>
---
qapi/opts-visitor.c | 34 ++++++++++++++++++++++++++++------
1 file changed, 28 insertions(+), 6 deletions(-)
diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c
index c2a57bd..90be583 100644
--- a/qapi/opts-visitor.c
+++ b/qapi/opts-visitor.c
@@ -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) {
- *obj = val;
- processed(ov, name);
- return;
+ if (errno == 0 && endptr > str && INT64_MIN <= val && val <= INT64_MAX) {
+ if (*endptr == '\0') {
+ *obj = val;
+ processed(ov, name);
+ return;
+ }
+ 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, "an int64 value");
+ error_set(errp, QERR_INVALID_PARAMETER_VALUE, opt->name,
+ (ov->list_mode == LM_NONE) ? "an int64 value" :
+ "an int64 value or range");
}
--
1.8.1.4
- [Qemu-devel] [PULL 00/11] QMP queue, Luiz Capitulino, 2013/08/20
- [Qemu-devel] [PULL 03/11] OptsVisitor: introduce list modes for interval flattening, Luiz Capitulino, 2013/08/20
- [Qemu-devel] [PULL 02/11] OptsVisitor: introduce basic list modes, Luiz Capitulino, 2013/08/20
- [Qemu-devel] [PULL 04/11] OptsVisitor: opts_type_int(): recognize intervals when LM_IN_PROGRESS,
Luiz Capitulino <=
- [Qemu-devel] [PULL 05/11] OptsVisitor: rebase opts_type_uint64() to parse_uint_full(), Luiz Capitulino, 2013/08/20
- [Qemu-devel] [PULL 01/11] Convert stderr message calling error_get_pretty() to error_report(), Luiz Capitulino, 2013/08/20
- [Qemu-devel] [PULL 06/11] OptsVisitor: opts_type_uint64(): recognize intervals when LM_IN_PROGRESS, Luiz Capitulino, 2013/08/20
- [Qemu-devel] [PULL 08/11] add "test-int128" and "test-bitops" to .gitignore, Luiz Capitulino, 2013/08/20
- Re: [Qemu-devel] [PULL 08/11] add "test-int128" and "test-bitops" to .gitignore, Andreas Färber, 2013/08/20
- Re: [Qemu-devel] [PULL 08/11] add "test-int128" and "test-bitops" to .gitignore, Luiz Capitulino, 2013/08/20
- Re: [Qemu-devel] [PULL 08/11] add "test-int128" and "test-bitops" to .gitignore, Andreas Färber, 2013/08/20
- Re: [Qemu-devel] [PULL 08/11] add "test-int128" and "test-bitops" to .gitignore, Laszlo Ersek, 2013/08/21
- Re: [Qemu-devel] [PULL 08/11] add "test-int128" and "test-bitops" to .gitignore, Eric Blake, 2013/08/21
- Re: [Qemu-devel] [PULL 08/11] add "test-int128" and "test-bitops" to .gitignore, Markus Armbruster, 2013/08/22