From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34778) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTgu7-0001El-DX for qemu-devel@nongnu.org; Wed, 31 Oct 2012 18:36:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTgu3-0005pn-Dy for qemu-devel@nongnu.org; Wed, 31 Oct 2012 18:36:55 -0400 Received: from mail-ia0-f173.google.com ([209.85.210.173]:37027) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTgu3-0005ku-8v for qemu-devel@nongnu.org; Wed, 31 Oct 2012 18:36:51 -0400 Received: by mail-ia0-f173.google.com with SMTP id m10so1511545iam.4 for ; Wed, 31 Oct 2012 15:36:51 -0700 (PDT) Sender: fluxion From: Michael Roth Date: Wed, 31 Oct 2012 17:35:58 -0500 Message-Id: <1351722972-17801-15-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1351722972-17801-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1351722972-17801-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 14/28] qapi: add visit_type_long() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, aliguori@us.ibm.com, blauwirbel@gmail.com, pbonzini@redhat.com Signed-off-by: Michael Roth --- qapi/qapi-visit-core.c | 18 ++++++++++++++++++ qapi/qapi-visit-core.h | 3 +++ 2 files changed, 21 insertions(+) diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c index dd28cb9..274361f 100644 --- a/qapi/qapi-visit-core.c +++ b/qapi/qapi-visit-core.c @@ -234,6 +234,24 @@ void visit_type_int64(Visitor *v, int64_t *obj, const char *name, Error **errp) } } +void visit_type_long(Visitor *v, long *obj, const char *name, Error **errp) +{ + int64_t value; + if (!error_is_set(errp)) { + if (v->type_long) { + v->type_long(v, obj, name, errp); + } else { + value = *obj; + visit_type_int64(v, &value, name, errp); + if (value < LONG_MIN || value > LONG_MAX) { + error_set(errp, QERR_INVALID_PARAMETER_VALUE, name ? name : "null", + "long"); + } + *obj = value; + } + } +} + void visit_type_size(Visitor *v, uint64_t *obj, const char *name, Error **errp) { if (!error_is_set(errp)) { diff --git a/qapi/qapi-visit-core.h b/qapi/qapi-visit-core.h index 5eb1616..04058e7 100644 --- a/qapi/qapi-visit-core.h +++ b/qapi/qapi-visit-core.h @@ -64,6 +64,8 @@ struct Visitor void (*type_int16)(Visitor *v, int16_t *obj, const char *name, Error **errp); void (*type_int32)(Visitor *v, int32_t *obj, const char *name, Error **errp); void (*type_int64)(Visitor *v, int64_t *obj, const char *name, Error **errp); + /* visit_type_long() falls back to (*type_int64)() if type_long is unset */ + void (*type_long)(Visitor *v, long *obj, const char *name, Error **errp); /* visit_type_size() falls back to (*type_uint64)() if type_size is unset */ void (*type_size)(Visitor *v, uint64_t *obj, const char *name, Error **errp); }; @@ -91,6 +93,7 @@ void visit_type_int8(Visitor *v, int8_t *obj, const char *name, Error **errp); void visit_type_int16(Visitor *v, int16_t *obj, const char *name, Error **errp); void visit_type_int32(Visitor *v, int32_t *obj, const char *name, Error **errp); void visit_type_int64(Visitor *v, int64_t *obj, const char *name, Error **errp); +void visit_type_long(Visitor *v, long *obj, const char *name, Error **errp); void visit_type_size(Visitor *v, uint64_t *obj, const char *name, Error **errp); void visit_type_bool(Visitor *v, bool *obj, const char *name, Error **errp); void visit_type_str(Visitor *v, char **obj, const char *name, Error **errp); -- 1.7.9.5