From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38647) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uzoht-0007go-CF for qemu-devel@nongnu.org; Thu, 18 Jul 2013 09:57:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uzohm-0006fI-PM for qemu-devel@nongnu.org; Thu, 18 Jul 2013 09:57:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50871) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uzohm-0006f7-Ea for qemu-devel@nongnu.org; Thu, 18 Jul 2013 09:57:14 -0400 From: Laszlo Ersek Date: Thu, 18 Jul 2013 15:59:21 +0200 Message-Id: <1374155964-11278-4-git-send-email-lersek@redhat.com> In-Reply-To: <1374155964-11278-1-git-send-email-lersek@redhat.com> References: <1374155964-11278-1-git-send-email-lersek@redhat.com> Subject: [Qemu-devel] [RFC 3/6] OptsVisitor: opts_type_int(): recognize intervals when LM_IN_PROGRESS List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, pbonzini@redhat.com, gaowanlong@cn.fujitsu.com 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 --- qapi/opts-visitor.c | 34 ++++++++++++++++++++++++++++------ 1 files changed, 28 insertions(+), 6 deletions(-) diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c index e8e317f..287aa06 100644 --- a/qapi/opts-visitor.c +++ b/qapi/opts-visitor.c @@ -344,15 +344,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.7.1