Patchwork [14/28] qapi: add visit_type_long()

login
register
mail settings
Submitter Michael Roth
Date Oct. 31, 2012, 10:35 p.m.
Message ID <1351722972-17801-15-git-send-email-mdroth@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/196050/
State New
Headers show

Comments

Michael Roth - Oct. 31, 2012, 10:35 p.m.
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
 qapi/qapi-visit-core.c |   18 ++++++++++++++++++
 qapi/qapi-visit-core.h |    3 +++
 2 files changed, 21 insertions(+)

Patch

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);