qobject: Use 'bool' for qbool

We require a C99 compiler, so let's use 'bool' instead of 'int'
when dealing with boolean values.  There are few enough clients
to fix them all in one pass.

Signed-off-by: Eric Blake <[email protected]>
Reviewed-by: Andreas Färber <[email protected]>
Reviewed-by: Alberto Garcia <[email protected]>
Acked-by: Luiz Capitulino <[email protected]>
Signed-off-by: Markus Armbruster <[email protected]>

diff --git a/block/qapi.c b/block/qapi.c
index a738148bce79d0bfc3e39d48e03efb21a6cd15b5..31b542a10b9886c672ae0d7dd7e56b9ca06ad5cc 100644 (file)
--- a/block/qapi.c
+++ b/block/qapi.c
@@ -520,7 +520,7 @@ static void dump_qobject(fprintf_function func_fprintf, void *f,
         }
         case QTYPE_QBOOL: {
             QBool *value = qobject_to_qbool(obj);
         }
         case QTYPE_QBOOL: {
             QBool *value = qobject_to_qbool(obj);

-            func_fprintf(f, "%s", qbool_get_int(value) ? "true" : "false");
+            func_fprintf(f, "%s", qbool_get_bool(value) ? "true" : "false");

             break;
         }
         case QTYPE_QERROR: {
             break;
         }
         case QTYPE_QERROR: {

diff --git a/block/quorum.c b/block/quorum.c
index 77e55b277500f6401abfc343bf508ddc37e54bde..581f2e12aa45179cc39996a80225a58980ae8874 100644 (file)
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -1024,9 +1024,9 @@ static void quorum_refresh_filename(BlockDriverState *bs)
     qdict_put_obj(opts, QUORUM_OPT_VOTE_THRESHOLD,
                   QOBJECT(qint_from_int(s->threshold)));
     qdict_put_obj(opts, QUORUM_OPT_BLKVERIFY,
     qdict_put_obj(opts, QUORUM_OPT_VOTE_THRESHOLD,
                   QOBJECT(qint_from_int(s->threshold)));
     qdict_put_obj(opts, QUORUM_OPT_BLKVERIFY,

-                  QOBJECT(qbool_from_int(s->is_blkverify)));
+                  QOBJECT(qbool_from_bool(s->is_blkverify)));

     qdict_put_obj(opts, QUORUM_OPT_REWRITE,
     qdict_put_obj(opts, QUORUM_OPT_REWRITE,

-                  QOBJECT(qbool_from_int(s->rewrite_corrupted)));
+                  QOBJECT(qbool_from_bool(s->rewrite_corrupted)));

     qdict_put_obj(opts, "children", QOBJECT(children));
 
     bs->full_open_options = opts;
     qdict_put_obj(opts, "children", QOBJECT(children));
 
     bs->full_open_options = opts;

diff --git a/block/vvfat.c b/block/vvfat.c
index e803589675e6db57a0b648ce8da2e04c6d8b9a2c..f3e3d49c23b3af57169a14c3bf12ef9b4efa4042 100644 (file)
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -1059,8 +1059,8 @@ static void vvfat_parse_filename(const char *filename, QDict *options,
     /* Fill in the options QDict */
     qdict_put(options, "dir", qstring_from_str(filename));
     qdict_put(options, "fat-type", qint_from_int(fat_type));
     /* Fill in the options QDict */
     qdict_put(options, "dir", qstring_from_str(filename));
     qdict_put(options, "fat-type", qint_from_int(fat_type));

-    qdict_put(options, "floppy", qbool_from_int(floppy));
-    qdict_put(options, "rw", qbool_from_int(rw));
+    qdict_put(options, "floppy", qbool_from_bool(floppy));
+    qdict_put(options, "rw", qbool_from_bool(rw));

 }
 
 static int vvfat_open(BlockDriverState *bs, QDict *options, int flags,
 }
 
 static int vvfat_open(BlockDriverState *bs, QDict *options, int flags,

diff --git a/include/qapi/qmp/qbool.h b/include/qapi/qmp/qbool.h
index c4eaab9bb9f03ff76e50e235d0981063be4328bc..4aa6be3b3378a77c6f18703f8e7e0cbda6731039 100644 (file)
--- a/include/qapi/qmp/qbool.h
+++ b/include/qapi/qmp/qbool.h
@@ -14,16 +14,16 @@
 #ifndef QBOOL_H
 #define QBOOL_H
 
 #ifndef QBOOL_H
 #define QBOOL_H
 

-#include <stdint.h>
+#include <stdbool.h>

 #include "qapi/qmp/qobject.h"
 
 typedef struct QBool {
     QObject_HEAD;
 #include "qapi/qmp/qobject.h"
 
 typedef struct QBool {
     QObject_HEAD;

-    int value;
+    bool value;

 } QBool;
 
 } QBool;
 

-QBool *qbool_from_int(int value);
-int qbool_get_int(const QBool *qb);
+QBool *qbool_from_bool(bool value);
+bool qbool_get_bool(const QBool *qb);

 QBool *qobject_to_qbool(const QObject *obj);
 
 #endif /* QBOOL_H */
 QBool *qobject_to_qbool(const QObject *obj);
 
 #endif /* QBOOL_H */

diff --git a/monitor.c b/monitor.c
index 8e1a2e85b8f428710aa797774d62eb799f03f083..4facf83bf0f75addba6e4ed4aeda3c8d29d9956a 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -3940,7 +3940,7 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon,
         case 'b':
             {
                 const char *beg;
         case 'b':
             {
                 const char *beg;

-                int val;
+                bool val;

 
                 while (qemu_isspace(*p)) {
                     p++;
 
                 while (qemu_isspace(*p)) {
                     p++;


@@ -3950,14 +3950,14 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon,
                     p++;
                 }
                 if (p - beg == 2 && !memcmp(beg, "on", p - beg)) {
                     p++;
                 }
                 if (p - beg == 2 && !memcmp(beg, "on", p - beg)) {

-                    val = 1;
+                    val = true;

                 } else if (p - beg == 3 && !memcmp(beg, "off", p - beg)) {
                 } else if (p - beg == 3 && !memcmp(beg, "off", p - beg)) {

-                    val = 0;
+                    val = false;

                 } else {
                     monitor_printf(mon, "Expected 'on' or 'off'\n");
                     goto fail;
                 }
                 } else {
                     monitor_printf(mon, "Expected 'on' or 'off'\n");
                     goto fail;
                 }

-                qdict_put(qdict, key, qbool_from_int(val));
+                qdict_put(qdict, key, qbool_from_bool(val));

             }
             break;
         case '-':
             }
             break;
         case '-':


@@ -3988,7 +3988,7 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon,
                     } else {
                         /* has option */
                         p++;
                     } else {
                         /* has option */
                         p++;

-                        qdict_put(qdict, key, qbool_from_int(1));
+                        qdict_put(qdict, key, qbool_from_bool(true));

                     }
                 }
             }
                     }
                 }
             }

diff --git a/qapi/qmp-input-visitor.c b/qapi/qmp-input-visitor.c
index d8612062f1e31a7b1e417f87b677d01ad06d6ceb..f6dab1ada6baabf3e7e623d18ce84c13f3b3faa3 100644 (file)
--- a/qapi/qmp-input-visitor.c
+++ b/qapi/qmp-input-visitor.c
@@ -248,7 +248,7 @@ static void qmp_input_type_bool(Visitor *v, bool *obj, const char *name,
         return;
     }
 
         return;
     }
 

-    *obj = qbool_get_int(qobject_to_qbool(qobj));
+    *obj = qbool_get_bool(qobject_to_qbool(qobj));

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

diff --git a/qapi/qmp-output-visitor.c b/qapi/qmp-output-visitor.c
index 96b338463ed8f16e385921a1ca056cd4d9625cf4..7e0f7ce16aa557acdc7e16decc87979b244b0a32 100644 (file)
--- a/qapi/qmp-output-visitor.c
+++ b/qapi/qmp-output-visitor.c
@@ -166,7 +166,7 @@ static void qmp_output_type_bool(Visitor *v, bool *obj, const char *name,
                                  Error **errp)
 {
     QmpOutputVisitor *qov = to_qov(v);
                                  Error **errp)
 {
     QmpOutputVisitor *qov = to_qov(v);

-    qmp_output_add(qov, name, qbool_from_int(*obj));
+    qmp_output_add(qov, name, qbool_from_bool(*obj));

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

diff --git a/qobject/json-parser.c b/qobject/json-parser.c
index 717cb8fde7e9dcd5aecb16a38a36cdd88c4cc541..015d7855f5e60b54d4ac9190a8b75ec75996c54e 100644 (file)
--- a/qobject/json-parser.c
+++ b/qobject/json-parser.c
@@ -558,9 +558,9 @@ static QObject *parse_keyword(JSONParserContext *ctxt)
     }
 
     if (token_is_keyword(token, "true")) {
     }
 
     if (token_is_keyword(token, "true")) {

-        ret = QOBJECT(qbool_from_int(true));
+        ret = QOBJECT(qbool_from_bool(true));

     } else if (token_is_keyword(token, "false")) {
     } else if (token_is_keyword(token, "false")) {

-        ret = QOBJECT(qbool_from_int(false));
+        ret = QOBJECT(qbool_from_bool(false));

     } else if (token_is_keyword(token, "null")) {
         ret = qnull();
     } else {
     } else if (token_is_keyword(token, "null")) {
         ret = qnull();
     } else {


@@ -593,7 +593,7 @@ static QObject *parse_escape(JSONParserContext *ctxt, va_list *ap)
     if (token_is_escape(token, "%p")) {
         obj = va_arg(*ap, QObject *);
     } else if (token_is_escape(token, "%i")) {
     if (token_is_escape(token, "%p")) {
         obj = va_arg(*ap, QObject *);
     } else if (token_is_escape(token, "%i")) {

-        obj = QOBJECT(qbool_from_int(va_arg(*ap, int)));
+        obj = QOBJECT(qbool_from_bool(va_arg(*ap, int)));

     } else if (token_is_escape(token, "%d")) {
         obj = QOBJECT(qint_from_int(va_arg(*ap, int)));
     } else if (token_is_escape(token, "%ld")) {
     } else if (token_is_escape(token, "%d")) {
         obj = QOBJECT(qint_from_int(va_arg(*ap, int)));
     } else if (token_is_escape(token, "%ld")) {

diff --git a/qobject/qbool.c b/qobject/qbool.c
index a3d2afa827ff13b6511425e728d99a750af4f045..5ff69f0b2dabe1e02933c3e967dfe8177800428f 100644 (file)
--- a/qobject/qbool.c
+++ b/qobject/qbool.c
@@ -23,11 +23,11 @@ static const QType qbool_type = {
 };
 
 /**
 };
 
 /**

- * qbool_from_int(): Create a new QBool from an int
+ * qbool_from_bool(): Create a new QBool from a bool

  *
  * Return strong reference.
  */
  *
  * Return strong reference.
  */

-QBool *qbool_from_int(int value)
+QBool *qbool_from_bool(bool value)

 {
     QBool *qb;
 
 {
     QBool *qb;
 


@@ -39,9 +39,9 @@ QBool *qbool_from_int(int value)
 }
 
 /**
 }
 
 /**

- * qbool_get_int(): Get the stored int
+ * qbool_get_bool(): Get the stored bool

  */
  */

-int qbool_get_int(const QBool *qb)
+bool qbool_get_bool(const QBool *qb)

 {
     return qb->value;
 }
 {
     return qb->value;
 }

diff --git a/qobject/qdict.c b/qobject/qdict.c
index 190791becf85bc50fbfe8a6d6850f728e339109c..2cb0c3c5fcec84af205e229782443b94a0d88901 100644 (file)
--- a/qobject/qdict.c
+++ b/qobject/qdict.c
@@ -244,7 +244,7 @@ int64_t qdict_get_int(const QDict *qdict, const char *key)
 int qdict_get_bool(const QDict *qdict, const char *key)
 {
     QObject *obj = qdict_get_obj(qdict, key, QTYPE_QBOOL);
 int qdict_get_bool(const QDict *qdict, const char *key)
 {
     QObject *obj = qdict_get_obj(qdict, key, QTYPE_QBOOL);

-    return qbool_get_int(qobject_to_qbool(obj));
+    return qbool_get_bool(qobject_to_qbool(obj));

 }
 
 /**
 }
 
 /**


@@ -322,7 +322,7 @@ int qdict_get_try_bool(const QDict *qdict, const char *key, int def_value)
     if (!obj || qobject_type(obj) != QTYPE_QBOOL)
         return def_value;
 
     if (!obj || qobject_type(obj) != QTYPE_QBOOL)
         return def_value;
 

-    return qbool_get_int(qobject_to_qbool(obj));
+    return qbool_get_bool(qobject_to_qbool(obj));

 }
 
 /**
 }
 
 /**

diff --git a/qobject/qjson.c b/qobject/qjson.c
index 846733dafb113f74af00ff5bd0dd6e86025b311c..f022edce1e11543b92b4bd9e08f706215e9b1af4 100644 (file)
--- a/qobject/qjson.c
+++ b/qobject/qjson.c
@@ -254,7 +254,7 @@ static void to_json(const QObject *obj, QString *str, int pretty, int indent)
     case QTYPE_QBOOL: {
         QBool *val = qobject_to_qbool(obj);
 
     case QTYPE_QBOOL: {
         QBool *val = qobject_to_qbool(obj);
 

-        if (qbool_get_int(val)) {
+        if (qbool_get_bool(val)) {

             qstring_append(str, "true");
         } else {
             qstring_append(str, "false");
             qstring_append(str, "true");
         } else {
             qstring_append(str, "false");

diff --git a/qom/object.c b/qom/object.c
index ee384311f903c502bfc09daa32d951a9f19984f7..7ed17bc779d6d61dc9a9f0fef1786122aee28ab3 100644 (file)
--- a/qom/object.c
+++ b/qom/object.c
@@ -1010,7 +1010,7 @@ Object *object_property_get_link(Object *obj, const char *name,
 void object_property_set_bool(Object *obj, bool value,
                               const char *name, Error **errp)
 {
 void object_property_set_bool(Object *obj, bool value,
                               const char *name, Error **errp)
 {

-    QBool *qbool = qbool_from_int(value);
+    QBool *qbool = qbool_from_bool(value);

     object_property_set_qobject(obj, QOBJECT(qbool), name, errp);
 
     QDECREF(qbool);
     object_property_set_qobject(obj, QOBJECT(qbool), name, errp);
 
     QDECREF(qbool);


@@ -1031,7 +1031,7 @@ bool object_property_get_bool(Object *obj, const char *name,
         error_set(errp, QERR_INVALID_PARAMETER_TYPE, name, "boolean");
         retval = false;
     } else {
         error_set(errp, QERR_INVALID_PARAMETER_TYPE, name, "boolean");
         retval = false;
     } else {

-        retval = qbool_get_int(qbool);
+        retval = qbool_get_bool(qbool);

     }
 
     QDECREF(qbool);
     }
 
     QDECREF(qbool);

diff --git a/tests/check-qjson.c b/tests/check-qjson.c
index 60e5b22a988cb22b91f43e3879b44307b79e65a8..1cfffa593437d862fce73bec7ceebbf16ada33a8 100644 (file)
--- a/tests/check-qjson.c
+++ b/tests/check-qjson.c
@@ -1013,7 +1013,7 @@ static void keyword_literal(void)
     g_assert(qobject_type(obj) == QTYPE_QBOOL);
 
     qbool = qobject_to_qbool(obj);
     g_assert(qobject_type(obj) == QTYPE_QBOOL);
 
     qbool = qobject_to_qbool(obj);

-    g_assert(qbool_get_int(qbool) != 0);
+    g_assert(qbool_get_bool(qbool) == true);

 
     str = qobject_to_json(obj);
     g_assert(strcmp(qstring_get_str(str), "true") == 0);
 
     str = qobject_to_json(obj);
     g_assert(strcmp(qstring_get_str(str), "true") == 0);


@@ -1026,7 +1026,7 @@ static void keyword_literal(void)
     g_assert(qobject_type(obj) == QTYPE_QBOOL);
 
     qbool = qobject_to_qbool(obj);
     g_assert(qobject_type(obj) == QTYPE_QBOOL);
 
     qbool = qobject_to_qbool(obj);

-    g_assert(qbool_get_int(qbool) == 0);
+    g_assert(qbool_get_bool(qbool) == false);

 
     str = qobject_to_json(obj);
     g_assert(strcmp(qstring_get_str(str), "false") == 0);
 
     str = qobject_to_json(obj);
     g_assert(strcmp(qstring_get_str(str), "false") == 0);


@@ -1039,16 +1039,17 @@ static void keyword_literal(void)
     g_assert(qobject_type(obj) == QTYPE_QBOOL);
 
     qbool = qobject_to_qbool(obj);
     g_assert(qobject_type(obj) == QTYPE_QBOOL);
 
     qbool = qobject_to_qbool(obj);

-    g_assert(qbool_get_int(qbool) == 0);
+    g_assert(qbool_get_bool(qbool) == false);

 
     QDECREF(qbool);
 
 
     QDECREF(qbool);
 

-    obj = qobject_from_jsonf("%i", true);
+    /* Test that non-zero values other than 1 get collapsed to true */
+    obj = qobject_from_jsonf("%i", 2);

     g_assert(obj != NULL);
     g_assert(qobject_type(obj) == QTYPE_QBOOL);
 
     qbool = qobject_to_qbool(obj);
     g_assert(obj != NULL);
     g_assert(qobject_type(obj) == QTYPE_QBOOL);
 
     qbool = qobject_to_qbool(obj);

-    g_assert(qbool_get_int(qbool) != 0);
+    g_assert(qbool_get_bool(qbool) == true);

 
     QDECREF(qbool);
 
 
     QDECREF(qbool);
 

diff --git a/tests/test-qmp-event.c b/tests/test-qmp-event.c
index cb354e6e81944c4b52320408d67d5b6ef786a06e..1ee40e148af62114d93dc9a812f7f796fe5eba52 100644 (file)
--- a/tests/test-qmp-event.c
+++ b/tests/test-qmp-event.c
@@ -60,8 +60,8 @@ void qdict_cmp_do_simple(const char *key, QObject *obj1, void *opaque)
 
     switch (qobject_type(obj1)) {
     case QTYPE_QBOOL:
 
     switch (qobject_type(obj1)) {
     case QTYPE_QBOOL:

-        d->result = (qbool_get_int(qobject_to_qbool(obj1)) ==
-                     qbool_get_int(qobject_to_qbool(obj2)));
+        d->result = (qbool_get_bool(qobject_to_qbool(obj1)) ==
+                     qbool_get_bool(qobject_to_qbool(obj2)));

         return;
     case QTYPE_QINT:
         d->result = (qint_get_int(qobject_to_qint(obj1)) ==
         return;
     case QTYPE_QINT:
         d->result = (qint_get_int(qobject_to_qint(obj1)) ==

diff --git a/tests/test-qmp-output-visitor.c b/tests/test-qmp-output-visitor.c
index f8c9367e48ca36a97a68090f5cdfbc771895286a..5be8e77aa5c5c994153a3579875d3a056d4784bc 100644 (file)
--- a/tests/test-qmp-output-visitor.c
+++ b/tests/test-qmp-output-visitor.c
@@ -72,7 +72,7 @@ static void test_visitor_out_bool(TestOutputVisitorData *data,
     obj = qmp_output_get_qobject(data->qov);
     g_assert(obj != NULL);
     g_assert(qobject_type(obj) == QTYPE_QBOOL);
     obj = qmp_output_get_qobject(data->qov);
     g_assert(obj != NULL);
     g_assert(qobject_type(obj) == QTYPE_QBOOL);

-    g_assert(qbool_get_int(qobject_to_qbool(obj)) == value);
+    g_assert(qbool_get_bool(qobject_to_qbool(obj)) == value);

 
     qobject_decref(obj);
 }
 
     qobject_decref(obj);
 }


@@ -662,7 +662,7 @@ static void check_native_list(QObject *qobj,
             tmp = qlist_peek(qlist);
             g_assert(tmp);
             qvalue = qobject_to_qbool(tmp);
             tmp = qlist_peek(qlist);
             g_assert(tmp);
             qvalue = qobject_to_qbool(tmp);

-            g_assert_cmpint(qbool_get_int(qvalue), ==, (i % 3 == 0) ? 1 : 0);
+            g_assert_cmpint(qbool_get_bool(qvalue), ==, i % 3 == 0);

             qobject_decref(qlist_pop(qlist));
         }
         break;
             qobject_decref(qlist_pop(qlist));
         }
         break;

diff --git a/util/qemu-option.c b/util/qemu-option.c
index 840f5f7a5b92f465684b5796a6e346f9f10634ab..69da28c7e167a11d26bd57b7404ff46bf3073c44 100644 (file)
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -927,7 +927,7 @@ static void qemu_opts_from_qdict_1(const char *key, QObject *obj, void *opaque)
         break;
     case QTYPE_QBOOL:
         pstrcpy(buf, sizeof(buf),
         break;
     case QTYPE_QBOOL:
         pstrcpy(buf, sizeof(buf),

-                qbool_get_int(qobject_to_qbool(obj)) ? "on" : "off");
+                qbool_get_bool(qobject_to_qbool(obj)) ? "on" : "off");

         value = buf;
         break;
     default:
         value = buf;
         break;
     default: