[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/11] OptsVisitor: opts_type_uint64(): recognize int
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PULL 06/11] OptsVisitor: opts_type_uint64(): recognize intervals when LM_IN_PROGRESS |
Date: |
Tue, 20 Aug 2013 12:10:36 -0400 |
From: Laszlo Ersek <address@hidden>
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 <address@hidden>
Tested-by: Wanlong Gao <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>
---
qapi/opts-visitor.c | 32 +++++++++++++++++++++++++++-----
1 file changed, 27 insertions(+), 5 deletions(-)
diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c
index d8f9a0e..d54d373 100644
--- a/qapi/opts-visitor.c
+++ b/qapi/opts-visitor.c
@@ -408,6 +408,7 @@ opts_type_uint64(Visitor *v, uint64_t *obj, const char
*name, Error **errp)
const QemuOpt *opt;
const char *str;
unsigned long long val;
+ char *endptr;
if (ov->list_mode == LM_UNSIGNED_INTERVAL) {
*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;
- if (parse_uint_full(str, &val, 0) == 0 && val <= UINT64_MAX) {
- *obj = val;
- processed(ov, name);
- return;
+ /* we've gotten past lookup_scalar() */
+ assert(ov->list_mode == LM_NONE || ov->list_mode == LM_IN_PROGRESS);
+
+ 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,
- "an uint64 value");
+ (ov->list_mode == LM_NONE) ? "a uint64 value" :
+ "a uint64 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, 2013/08/20
- [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 <=
- [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
[Qemu-devel] [PULL 07/11] OptsVisitor: don't try to flatten overlong integer ranges, Luiz Capitulino, 2013/08/20
[Qemu-devel] [PULL 09/11] OptsVisitor: introduce unit tests, with test cases for range flattening, Luiz Capitulino, 2013/08/20
[Qemu-devel] [PULL 11/11] scripts/qapi.py: Avoid syntax not supported by Python 2.4, Luiz Capitulino, 2013/08/20