diff options
| author | Eric Blake <eblake@redhat.com> | 2015-05-15 16:24:59 -0600 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2015-06-22 17:40:00 +0200 |
| commit | fc48ffc39ed1060856475e4320d5896f26c945e8 (patch) | |
| tree | 4e4a5a4b9a6b9a0602fe5863e694ec472edccbf8 /block | |
| parent | 0a3346f5dea0a679322df804e1e78d7c10d12a9f (diff) | |
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 <eblake@redhat.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Acked-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/qapi.c | 2 | ||||
| -rw-r--r-- | block/quorum.c | 4 | ||||
| -rw-r--r-- | block/vvfat.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/block/qapi.c b/block/qapi.c index a738148bce..31b542a10b 100644 --- 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); - func_fprintf(f, "%s", qbool_get_int(value) ? "true" : "false"); + func_fprintf(f, "%s", qbool_get_bool(value) ? "true" : "false"); break; } case QTYPE_QERROR: { diff --git a/block/quorum.c b/block/quorum.c index 77e55b2775..581f2e12aa 100644 --- 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, - 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)); bs->full_open_options = opts; diff --git a/block/vvfat.c b/block/vvfat.c index e803589675..f3e3d49c23 100644 --- 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)); - 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, |