From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47580) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z771e-0005ab-80 for qemu-devel@nongnu.org; Mon, 22 Jun 2015 15:05:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z771a-0002M4-Gz for qemu-devel@nongnu.org; Mon, 22 Jun 2015 15:04:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40204) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z771a-0002Lv-85 for qemu-devel@nongnu.org; Mon, 22 Jun 2015 15:04:54 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id EA1DD2B9DF2 for ; Mon, 22 Jun 2015 19:04:53 +0000 (UTC) From: Markus Armbruster Date: Mon, 22 Jun 2015 21:04:26 +0200 Message-Id: <1434999889-849-2-git-send-email-armbru@redhat.com> In-Reply-To: <1434999889-849-1-git-send-email-armbru@redhat.com> References: <1434999889-849-1-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 01/24] qobject: Use 'bool' for qbool List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org From: Eric Blake 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 Reviewed-by: Andreas F=C3=A4rber Reviewed-by: Alberto Garcia Acked-by: Luiz Capitulino Signed-off-by: Markus Armbruster --- block/qapi.c | 2 +- block/quorum.c | 4 ++-- block/vvfat.c | 4 ++-- include/qapi/qmp/qbool.h | 8 ++++---- monitor.c | 10 +++++----- qapi/qmp-input-visitor.c | 2 +- qapi/qmp-output-visitor.c | 2 +- qobject/json-parser.c | 6 +++--- qobject/qbool.c | 8 ++++---- qobject/qdict.c | 4 ++-- qobject/qjson.c | 2 +- qom/object.c | 4 ++-- tests/check-qjson.c | 11 ++++++----- tests/test-qmp-event.c | 4 ++-- tests/test-qmp-output-visitor.c | 4 ++-- util/qemu-option.c | 2 +- 16 files changed, 39 insertions(+), 38 deletions(-) diff --git a/block/qapi.c b/block/qapi.c index a738148..31b542a 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -520,7 +520,7 @@ static void dump_qobject(fprintf_function func_fprint= f, void *f, } case QTYPE_QBOOL: { QBool *value =3D qobject_to_qbool(obj); - func_fprintf(f, "%s", qbool_get_int(value) ? "true" : "false= "); + func_fprintf(f, "%s", qbool_get_bool(value) ? "true" : "fals= e"); break; } case QTYPE_QERROR: { diff --git a/block/quorum.c b/block/quorum.c index 77e55b2..581f2e1 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -1024,9 +1024,9 @@ static void quorum_refresh_filename(BlockDriverStat= e *bs) 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, - QOBJECT(qbool_from_int(s->rewrite_corrupted))); + QOBJECT(qbool_from_bool(s->rewrite_corrupted))); qdict_put_obj(opts, "children", QOBJECT(children)); =20 bs->full_open_options =3D opts; diff --git a/block/vvfat.c b/block/vvfat.c index e803589..f3e3d49 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -1059,8 +1059,8 @@ static void vvfat_parse_filename(const char *filena= me, 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)); - 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)); } =20 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 c4eaab9..4aa6be3 100644 --- a/include/qapi/qmp/qbool.h +++ b/include/qapi/qmp/qbool.h @@ -14,16 +14,16 @@ #ifndef QBOOL_H #define QBOOL_H =20 -#include +#include #include "qapi/qmp/qobject.h" =20 typedef struct QBool { QObject_HEAD; - int value; + bool value; } QBool; =20 -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); =20 #endif /* QBOOL_H */ diff --git a/monitor.c b/monitor.c index 8e1a2e8..4facf83 100644 --- a/monitor.c +++ b/monitor.c @@ -3940,7 +3940,7 @@ static const mon_cmd_t *monitor_parse_command(Monit= or *mon, case 'b': { const char *beg; - int val; + bool val; =20 while (qemu_isspace(*p)) { p++; @@ -3950,14 +3950,14 @@ static const mon_cmd_t *monitor_parse_command(Mon= itor *mon, p++; } if (p - beg =3D=3D 2 && !memcmp(beg, "on", p - beg)) { - val =3D 1; + val =3D true; } else if (p - beg =3D=3D 3 && !memcmp(beg, "off", p - b= eg)) { - val =3D 0; + val =3D false; } 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 '-': @@ -3988,7 +3988,7 @@ static const mon_cmd_t *monitor_parse_command(Monit= or *mon, } 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 d861206..f6dab1a 100644 --- 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; } =20 - *obj =3D qbool_get_int(qobject_to_qbool(qobj)); + *obj =3D qbool_get_bool(qobject_to_qbool(qobj)); } =20 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 96b3384..7e0f7ce 100644 --- 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 *ob= j, const char *name, Error **errp) { QmpOutputVisitor *qov =3D to_qov(v); - qmp_output_add(qov, name, qbool_from_int(*obj)); + qmp_output_add(qov, name, qbool_from_bool(*obj)); } =20 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 717cb8f..015d785 100644 --- a/qobject/json-parser.c +++ b/qobject/json-parser.c @@ -558,9 +558,9 @@ static QObject *parse_keyword(JSONParserContext *ctxt= ) } =20 if (token_is_keyword(token, "true")) { - ret =3D QOBJECT(qbool_from_int(true)); + ret =3D QOBJECT(qbool_from_bool(true)); } else if (token_is_keyword(token, "false")) { - ret =3D QOBJECT(qbool_from_int(false)); + ret =3D QOBJECT(qbool_from_bool(false)); } else if (token_is_keyword(token, "null")) { ret =3D qnull(); } else { @@ -593,7 +593,7 @@ static QObject *parse_escape(JSONParserContext *ctxt,= va_list *ap) if (token_is_escape(token, "%p")) { obj =3D va_arg(*ap, QObject *); } else if (token_is_escape(token, "%i")) { - obj =3D QOBJECT(qbool_from_int(va_arg(*ap, int))); + obj =3D QOBJECT(qbool_from_bool(va_arg(*ap, int))); } else if (token_is_escape(token, "%d")) { obj =3D 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 a3d2afa..5ff69f0 100644 --- a/qobject/qbool.c +++ b/qobject/qbool.c @@ -23,11 +23,11 @@ static const QType qbool_type =3D { }; =20 /** - * qbool_from_int(): Create a new QBool from an int + * qbool_from_bool(): Create a new QBool from a bool * * Return strong reference. */ -QBool *qbool_from_int(int value) +QBool *qbool_from_bool(bool value) { QBool *qb; =20 @@ -39,9 +39,9 @@ QBool *qbool_from_int(int value) } =20 /** - * 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; } diff --git a/qobject/qdict.c b/qobject/qdict.c index 190791b..2cb0c3c 100644 --- 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 =3D qdict_get_obj(qdict, key, QTYPE_QBOOL); - return qbool_get_int(qobject_to_qbool(obj)); + return qbool_get_bool(qobject_to_qbool(obj)); } =20 /** @@ -322,7 +322,7 @@ int qdict_get_try_bool(const QDict *qdict, const char= *key, int def_value) if (!obj || qobject_type(obj) !=3D QTYPE_QBOOL) return def_value; =20 - return qbool_get_int(qobject_to_qbool(obj)); + return qbool_get_bool(qobject_to_qbool(obj)); } =20 /** diff --git a/qobject/qjson.c b/qobject/qjson.c index 846733d..f022edc 100644 --- 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 =3D qobject_to_qbool(obj); =20 - if (qbool_get_int(val)) { + if (qbool_get_bool(val)) { qstring_append(str, "true"); } else { qstring_append(str, "false"); diff --git a/qom/object.c b/qom/object.c index ee38431..7ed17bc 100644 --- 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) { - QBool *qbool =3D qbool_from_int(value); + QBool *qbool =3D qbool_from_bool(value); object_property_set_qobject(obj, QOBJECT(qbool), name, errp); =20 QDECREF(qbool); @@ -1031,7 +1031,7 @@ bool object_property_get_bool(Object *obj, const ch= ar *name, error_set(errp, QERR_INVALID_PARAMETER_TYPE, name, "boolean"); retval =3D false; } else { - retval =3D qbool_get_int(qbool); + retval =3D qbool_get_bool(qbool); } =20 QDECREF(qbool); diff --git a/tests/check-qjson.c b/tests/check-qjson.c index 60e5b22..1cfffa5 100644 --- a/tests/check-qjson.c +++ b/tests/check-qjson.c @@ -1013,7 +1013,7 @@ static void keyword_literal(void) g_assert(qobject_type(obj) =3D=3D QTYPE_QBOOL); =20 qbool =3D qobject_to_qbool(obj); - g_assert(qbool_get_int(qbool) !=3D 0); + g_assert(qbool_get_bool(qbool) =3D=3D true); =20 str =3D qobject_to_json(obj); g_assert(strcmp(qstring_get_str(str), "true") =3D=3D 0); @@ -1026,7 +1026,7 @@ static void keyword_literal(void) g_assert(qobject_type(obj) =3D=3D QTYPE_QBOOL); =20 qbool =3D qobject_to_qbool(obj); - g_assert(qbool_get_int(qbool) =3D=3D 0); + g_assert(qbool_get_bool(qbool) =3D=3D false); =20 str =3D qobject_to_json(obj); g_assert(strcmp(qstring_get_str(str), "false") =3D=3D 0); @@ -1039,16 +1039,17 @@ static void keyword_literal(void) g_assert(qobject_type(obj) =3D=3D QTYPE_QBOOL); =20 qbool =3D qobject_to_qbool(obj); - g_assert(qbool_get_int(qbool) =3D=3D 0); + g_assert(qbool_get_bool(qbool) =3D=3D false); =20 QDECREF(qbool); =20 - obj =3D qobject_from_jsonf("%i", true); + /* Test that non-zero values other than 1 get collapsed to true */ + obj =3D qobject_from_jsonf("%i", 2); g_assert(obj !=3D NULL); g_assert(qobject_type(obj) =3D=3D QTYPE_QBOOL); =20 qbool =3D qobject_to_qbool(obj); - g_assert(qbool_get_int(qbool) !=3D 0); + g_assert(qbool_get_bool(qbool) =3D=3D true); =20 QDECREF(qbool); =20 diff --git a/tests/test-qmp-event.c b/tests/test-qmp-event.c index cb354e6..1ee40e1 100644 --- 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) =20 switch (qobject_type(obj1)) { case QTYPE_QBOOL: - d->result =3D (qbool_get_int(qobject_to_qbool(obj1)) =3D=3D - qbool_get_int(qobject_to_qbool(obj2))); + d->result =3D (qbool_get_bool(qobject_to_qbool(obj1)) =3D=3D + qbool_get_bool(qobject_to_qbool(obj2))); return; case QTYPE_QINT: d->result =3D (qint_get_int(qobject_to_qint(obj1)) =3D=3D diff --git a/tests/test-qmp-output-visitor.c b/tests/test-qmp-output-visi= tor.c index f8c9367..5be8e77 100644 --- 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 =3D qmp_output_get_qobject(data->qov); g_assert(obj !=3D NULL); g_assert(qobject_type(obj) =3D=3D QTYPE_QBOOL); - g_assert(qbool_get_int(qobject_to_qbool(obj)) =3D=3D value); + g_assert(qbool_get_bool(qobject_to_qbool(obj)) =3D=3D value); =20 qobject_decref(obj); } @@ -662,7 +662,7 @@ static void check_native_list(QObject *qobj, tmp =3D qlist_peek(qlist); g_assert(tmp); qvalue =3D qobject_to_qbool(tmp); - g_assert_cmpint(qbool_get_int(qvalue), =3D=3D, (i % 3 =3D=3D= 0) ? 1 : 0); + g_assert_cmpint(qbool_get_bool(qvalue), =3D=3D, i % 3 =3D=3D= 0); qobject_decref(qlist_pop(qlist)); } break; diff --git a/util/qemu-option.c b/util/qemu-option.c index 840f5f7..69da28c 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -927,7 +927,7 @@ static void qemu_opts_from_qdict_1(const char *key, Q= Object *obj, void *opaque) 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 =3D buf; break; default: --=20 1.9.3