hppa-softmmu.mak: express dependencies with Kconfig

[qemu.git] / qapi / qobject-input-visitor.c

diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c
index eac40f618a603d9c0a4da0986d4b9d9a7401d8fe..07465f9947821e1cd90af3e450ba24ba535ba2b2 100644 (file)
--- a/qapi/qobject-input-visitor.c
+++ b/qapi/qobject-input-visitor.c
@@ -20,8 +20,13 @@
 #include "qemu/queue.h"
 #include "qemu-common.h"
 #include "qapi/qmp/qjson.h"
 #include "qemu/queue.h"
 #include "qemu-common.h"
 #include "qapi/qmp/qjson.h"

-#include "qapi/qmp/types.h"
+#include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qdict.h"

 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qerror.h"

+#include "qapi/qmp/qlist.h"
+#include "qapi/qmp/qnull.h"
+#include "qapi/qmp/qnum.h"
+#include "qapi/qmp/qstring.h"

 #include "qemu/cutils.h"
 #include "qemu/option.h"
 
 #include "qemu/cutils.h"
 #include "qemu/option.h"
 


@@ -132,7 +137,7 @@ static QObject *qobject_input_try_get_object(QObjectInputVisitor *qiv,
 
     if (qobject_type(qobj) == QTYPE_QDICT) {
         assert(name);
 
     if (qobject_type(qobj) == QTYPE_QDICT) {
         assert(name);

-        ret = qdict_get(qobject_to_qdict(qobj), name);
+        ret = qdict_get(qobject_to(QDict, qobj), name);

         if (tos->h && consume && ret) {
             bool removed = g_hash_table_remove(tos->h, name);
             assert(removed);
         if (tos->h && consume && ret) {
             bool removed = g_hash_table_remove(tos->h, name);
             assert(removed);


@@ -180,7 +185,7 @@ static const char *qobject_input_get_keyval(QObjectInputVisitor *qiv,
         return NULL;
     }
 
         return NULL;
     }
 

-    qstr = qobject_to_qstring(qobj);
+    qstr = qobject_to(QString, qobj);

     if (!qstr) {
         switch (qobject_type(qobj)) {
         case QTYPE_QDICT:
     if (!qstr) {
         switch (qobject_type(qobj)) {
         case QTYPE_QDICT:


@@ -219,11 +224,11 @@ static const QListEntry *qobject_input_push(QObjectInputVisitor *qiv,
 
     if (qobject_type(obj) == QTYPE_QDICT) {
         h = g_hash_table_new(g_str_hash, g_str_equal);
 
     if (qobject_type(obj) == QTYPE_QDICT) {
         h = g_hash_table_new(g_str_hash, g_str_equal);

-        qdict_iter(qobject_to_qdict(obj), qdict_add_key, h);
+        qdict_iter(qobject_to(QDict, obj), qdict_add_key, h);

         tos->h = h;
     } else {
         assert(qobject_type(obj) == QTYPE_QLIST);
         tos->h = h;
     } else {
         assert(qobject_type(obj) == QTYPE_QLIST);

-        tos->entry = qlist_first(qobject_to_qlist(obj));
+        tos->entry = qlist_first(qobject_to(QList, obj));

         tos->index = -1;
     }
 
         tos->index = -1;
     }
 


@@ -334,7 +339,7 @@ static GenericList *qobject_input_next_list(Visitor *v, GenericList *tail,
     QObjectInputVisitor *qiv = to_qiv(v);
     StackObject *tos = QSLIST_FIRST(&qiv->stack);
 
     QObjectInputVisitor *qiv = to_qiv(v);
     StackObject *tos = QSLIST_FIRST(&qiv->stack);
 

-    assert(tos && tos->obj && qobject_type(tos->obj) == QTYPE_QLIST);
+    assert(tos && qobject_to(QList, tos->obj));

 
     if (!tos->entry) {
         return NULL;
 
     if (!tos->entry) {
         return NULL;


@@ -348,7 +353,7 @@ static void qobject_input_check_list(Visitor *v, Error **errp)
     QObjectInputVisitor *qiv = to_qiv(v);
     StackObject *tos = QSLIST_FIRST(&qiv->stack);
 
     QObjectInputVisitor *qiv = to_qiv(v);
     StackObject *tos = QSLIST_FIRST(&qiv->stack);
 

-    assert(tos && tos->obj && qobject_type(tos->obj) == QTYPE_QLIST);
+    assert(tos && qobject_to(QList, tos->obj));

 
     if (tos->entry) {
         error_setg(errp, "Only %u list elements expected in %s",
 
     if (tos->entry) {
         error_setg(errp, "Only %u list elements expected in %s",


@@ -367,7 +372,7 @@ static void qobject_input_end_list(Visitor *v, void **obj)
 
 static void qobject_input_start_alternate(Visitor *v, const char *name,
                                           GenericAlternate **obj, size_t size,
 
 static void qobject_input_start_alternate(Visitor *v, const char *name,
                                           GenericAlternate **obj, size_t size,

-                                          bool promote_int, Error **errp)
+                                          Error **errp)

 {
     QObjectInputVisitor *qiv = to_qiv(v);
     QObject *qobj = qobject_input_get_object(qiv, name, false, errp);
 {
     QObjectInputVisitor *qiv = to_qiv(v);
     QObject *qobj = qobject_input_get_object(qiv, name, false, errp);


@@ -378,9 +383,6 @@ static void qobject_input_start_alternate(Visitor *v, const char *name,
     }
     *obj = g_malloc0(size);
     (*obj)->type = qobject_type(qobj);
     }
     *obj = g_malloc0(size);
     (*obj)->type = qobject_type(qobj);

-    if (promote_int && (*obj)->type == QTYPE_QINT) {
-        (*obj)->type = QTYPE_QFLOAT;
-    }

 }
 
 static void qobject_input_type_int64(Visitor *v, const char *name, int64_t *obj,
 }
 
 static void qobject_input_type_int64(Visitor *v, const char *name, int64_t *obj,


@@ -388,22 +390,18 @@ static void qobject_input_type_int64(Visitor *v, const char *name, int64_t *obj,
 {
     QObjectInputVisitor *qiv = to_qiv(v);
     QObject *qobj = qobject_input_get_object(qiv, name, true, errp);
 {
     QObjectInputVisitor *qiv = to_qiv(v);
     QObject *qobj = qobject_input_get_object(qiv, name, true, errp);

-    QInt *qint;
+    QNum *qnum;

 
     if (!qobj) {
         return;
     }
 
     if (!qobj) {
         return;
     }

-    qint = qobject_to_qint(qobj);
-    if (!qint) {
+    qnum = qobject_to(QNum, qobj);
+    if (!qnum || !qnum_get_try_int(qnum, obj)) {

         error_setg(errp, QERR_INVALID_PARAMETER_TYPE,
                    full_name(qiv, name), "integer");
         error_setg(errp, QERR_INVALID_PARAMETER_TYPE,
                    full_name(qiv, name), "integer");

-        return;

     }
     }

-
-    *obj = qint_get_int(qint);

 }
 
 }
 

-

 static void qobject_input_type_int64_keyval(Visitor *v, const char *name,
                                             int64_t *obj, Error **errp)
 {
 static void qobject_input_type_int64_keyval(Visitor *v, const char *name,
                                             int64_t *obj, Error **errp)
 {


@@ -424,22 +422,32 @@ static void qobject_input_type_int64_keyval(Visitor *v, const char *name,
 static void qobject_input_type_uint64(Visitor *v, const char *name,
                                       uint64_t *obj, Error **errp)
 {
 static void qobject_input_type_uint64(Visitor *v, const char *name,
                                       uint64_t *obj, Error **errp)
 {

-    /* FIXME: qobject_to_qint mishandles values over INT64_MAX */

     QObjectInputVisitor *qiv = to_qiv(v);
     QObject *qobj = qobject_input_get_object(qiv, name, true, errp);
     QObjectInputVisitor *qiv = to_qiv(v);
     QObject *qobj = qobject_input_get_object(qiv, name, true, errp);

-    QInt *qint;
+    QNum *qnum;
+    int64_t val;

 
     if (!qobj) {
         return;
     }
 
     if (!qobj) {
         return;
     }

-    qint = qobject_to_qint(qobj);
-    if (!qint) {
-        error_setg(errp, QERR_INVALID_PARAMETER_TYPE,
-                   full_name(qiv, name), "integer");
+    qnum = qobject_to(QNum, qobj);
+    if (!qnum) {
+        goto err;
+    }
+
+    if (qnum_get_try_uint(qnum, obj)) {
+        return;
+    }
+
+    /* Need to accept negative values for backward compatibility */
+    if (qnum_get_try_int(qnum, &val)) {
+        *obj = val;

         return;
     }
 
         return;
     }
 

-    *obj = qint_get_int(qint);
+err:
+    error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
+               full_name(qiv, name), "uint64");

 }
 
 static void qobject_input_type_uint64_keyval(Visitor *v, const char *name,
 }
 
 static void qobject_input_type_uint64_keyval(Visitor *v, const char *name,


@@ -469,7 +477,7 @@ static void qobject_input_type_bool(Visitor *v, const char *name, bool *obj,
     if (!qobj) {
         return;
     }
     if (!qobj) {
         return;
     }

-    qbool = qobject_to_qbool(qobj);
+    qbool = qobject_to(QBool, qobj);

     if (!qbool) {
         error_setg(errp, QERR_INVALID_PARAMETER_TYPE,
                    full_name(qiv, name), "boolean");
     if (!qbool) {
         error_setg(errp, QERR_INVALID_PARAMETER_TYPE,
                    full_name(qiv, name), "boolean");


@@ -510,7 +518,7 @@ static void qobject_input_type_str(Visitor *v, const char *name, char **obj,
     if (!qobj) {
         return;
     }
     if (!qobj) {
         return;
     }

-    qstr = qobject_to_qstring(qobj);
+    qstr = qobject_to(QString, qobj);

     if (!qstr) {
         error_setg(errp, QERR_INVALID_PARAMETER_TYPE,
                    full_name(qiv, name), "string");
     if (!qstr) {
         error_setg(errp, QERR_INVALID_PARAMETER_TYPE,
                    full_name(qiv, name), "string");


@@ -534,26 +542,19 @@ static void qobject_input_type_number(Visitor *v, const char *name, double *obj,
 {
     QObjectInputVisitor *qiv = to_qiv(v);
     QObject *qobj = qobject_input_get_object(qiv, name, true, errp);
 {
     QObjectInputVisitor *qiv = to_qiv(v);
     QObject *qobj = qobject_input_get_object(qiv, name, true, errp);

-    QInt *qint;
-    QFloat *qfloat;
+    QNum *qnum;

 
     if (!qobj) {
         return;
     }
 
     if (!qobj) {
         return;
     }

-    qint = qobject_to_qint(qobj);
-    if (qint) {
-        *obj = qint_get_int(qobject_to_qint(qobj));
-        return;
-    }
-
-    qfloat = qobject_to_qfloat(qobj);
-    if (qfloat) {
-        *obj = qfloat_get_double(qobject_to_qfloat(qobj));
+    qnum = qobject_to(QNum, qobj);
+    if (!qnum) {
+        error_setg(errp, QERR_INVALID_PARAMETER_TYPE,
+                   full_name(qiv, name), "number");

         return;
     }
 
         return;
     }
 

-    error_setg(errp, QERR_INVALID_PARAMETER_TYPE,
-               full_name(qiv, name), "number");
+    *obj = qnum_get_double(qnum);

 }
 
 static void qobject_input_type_number_keyval(Visitor *v, const char *name,
 }
 
 static void qobject_input_type_number_keyval(Visitor *v, const char *name,


@@ -561,19 +562,20 @@ static void qobject_input_type_number_keyval(Visitor *v, const char *name,
 {
     QObjectInputVisitor *qiv = to_qiv(v);
     const char *str = qobject_input_get_keyval(qiv, name, errp);
 {
     QObjectInputVisitor *qiv = to_qiv(v);
     const char *str = qobject_input_get_keyval(qiv, name, errp);

-    char *endp;
+    double val;

 
     if (!str) {
         return;
     }
 
 
     if (!str) {
         return;
     }
 

-    errno = 0;
-    *obj = strtod(str, &endp);
-    if (errno || endp == str || *endp || !isfinite(*obj)) {
+    if (qemu_strtod_finite(str, NULL, &val)) {

         /* TODO report -ERANGE more nicely */
         error_setg(errp, QERR_INVALID_PARAMETER_TYPE,
                    full_name(qiv, name), "number");
         /* TODO report -ERANGE more nicely */
         error_setg(errp, QERR_INVALID_PARAMETER_TYPE,
                    full_name(qiv, name), "number");

+        return;

     }
     }

+
+    *obj = val;

 }
 
 static void qobject_input_type_any(Visitor *v, const char *name, QObject **obj,
 }
 
 static void qobject_input_type_any(Visitor *v, const char *name, QObject **obj,


@@ -587,15 +589,16 @@ static void qobject_input_type_any(Visitor *v, const char *name, QObject **obj,
         return;
     }
 
         return;
     }
 

-    qobject_incref(qobj);
-    *obj = qobj;
+    *obj = qobject_ref(qobj);

 }
 
 }
 

-static void qobject_input_type_null(Visitor *v, const char *name, Error **errp)
+static void qobject_input_type_null(Visitor *v, const char *name,
+                                    QNull **obj, Error **errp)

 {
     QObjectInputVisitor *qiv = to_qiv(v);
     QObject *qobj = qobject_input_get_object(qiv, name, true, errp);
 
 {
     QObjectInputVisitor *qiv = to_qiv(v);
     QObject *qobj = qobject_input_get_object(qiv, name, true, errp);
 

+    *obj = NULL;

     if (!qobj) {
         return;
     }
     if (!qobj) {
         return;
     }


@@ -603,7 +606,9 @@ static void qobject_input_type_null(Visitor *v, const char *name, Error **errp)
     if (qobject_type(qobj) != QTYPE_QNULL) {
         error_setg(errp, QERR_INVALID_PARAMETER_TYPE,
                    full_name(qiv, name), "null");
     if (qobject_type(qobj) != QTYPE_QNULL) {
         error_setg(errp, QERR_INVALID_PARAMETER_TYPE,
                    full_name(qiv, name), "null");

+        return;

     }
     }

+    *obj = qnull();

 }
 
 static void qobject_input_type_size_keyval(Visitor *v, const char *name,
 }
 
 static void qobject_input_type_size_keyval(Visitor *v, const char *name,


@@ -647,7 +652,7 @@ static void qobject_input_free(Visitor *v)
         qobject_input_stack_object_free(tos);
     }
 
         qobject_input_stack_object_free(tos);
     }
 

-    qobject_decref(qiv->root);
+    qobject_unref(qiv->root);

     if (qiv->errname) {
         g_string_free(qiv->errname, TRUE);
     }
     if (qiv->errname) {
         g_string_free(qiv->errname, TRUE);
     }


@@ -672,8 +677,7 @@ static QObjectInputVisitor *qobject_input_visitor_base_new(QObject *obj)
     v->visitor.optional = qobject_input_optional;
     v->visitor.free = qobject_input_free;
 
     v->visitor.optional = qobject_input_optional;
     v->visitor.free = qobject_input_free;
 

-    v->root = obj;
-    qobject_incref(obj);
+    v->root = qobject_ref(obj);

 
     return v;
 }
 
     return v;
 }


@@ -722,14 +726,9 @@ Visitor *qobject_input_visitor_new_str(const char *str,
     if (is_json) {
         obj = qobject_from_json(str, errp);
         if (!obj) {
     if (is_json) {
         obj = qobject_from_json(str, errp);
         if (!obj) {

-            /* Work around qobject_from_json() lossage TODO fix that */
-            if (errp && !*errp) {
-                error_setg(errp, "JSON parse error");
-                return NULL;
-            }

             return NULL;
         }
             return NULL;
         }

-        args = qobject_to_qdict(obj);
+        args = qobject_to(QDict, obj);

         assert(args);
         v = qobject_input_visitor_new(QOBJECT(args));
     } else {
         assert(args);
         v = qobject_input_visitor_new(QOBJECT(args));
     } else {


@@ -739,7 +738,7 @@ Visitor *qobject_input_visitor_new_str(const char *str,
         }
         v = qobject_input_visitor_new_keyval(QOBJECT(args));
     }
         }
         v = qobject_input_visitor_new_keyval(QOBJECT(args));
     }

-    QDECREF(args);
+    qobject_unref(args);

 
     return v;
 }
 
     return v;
 }