OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qobject: Drop useless QObject casts

Browse Source 
We have macros in place to make it less verbose to add a subtype
of QObject to both QDict and QList. While we have made cleanups
like this in the past (see commit fcfcd8ffc, for example), having
it be automated by Coccinelle makes it easier to maintain.

Patch created mechanically via:
  spatch --sp-file scripts/coccinelle/qobject.cocci \
    --macro-file scripts/cocci-macro-file.h --dir . --in-place
then I verified that no manual touchups were required.

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20170427215821.19397-5-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Eric Blake 2017-04-27 16:58:15 -05:00 committed by Markus Armbruster
parent a2f3453ebc
commit de6e7951fe
8 changed files with 42 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
block.c
View File

@ -4712,11 +4712,9 @@ void bdrv_refresh_filename(BlockDriverState *bs)
* contain a representation of the filename, therefore the following * contain a representation of the filename, therefore the following
* suffices without querying the (exact_)filename of this BDS. */ * suffices without querying the (exact_)filename of this BDS. */
if (bs->file->bs->full_open_options) { if (bs->file->bs->full_open_options) {
qdict_put_obj(opts, "driver", qdict_put(opts, "driver", qstring_from_str(drv->format_name));
QOBJECT(qstring_from_str(drv->format_name)));
QINCREF(bs->file->bs->full_open_options); QINCREF(bs->file->bs->full_open_options);
qdict_put_obj(opts, "file", qdict_put(opts, "file", bs->file->bs->full_open_options);
QOBJECT(bs->file->bs->full_open_options));
bs->full_open_options = opts; bs->full_open_options = opts;
} else { } else {
@ -4732,8 +4730,7 @@ void bdrv_refresh_filename(BlockDriverState *bs)
opts = qdict_new(); opts = qdict_new();
append_open_options(opts, bs); append_open_options(opts, bs);
qdict_put_obj(opts, "driver", qdict_put(opts, "driver", qstring_from_str(drv->format_name));
QOBJECT(qstring_from_str(drv->format_name)));
if (bs->exact_filename[0]) { if (bs->exact_filename[0]) {
/* This may not work for all block protocol drivers (some may /* This may not work for all block protocol drivers (some may
@ -4743,8 +4740,7 @@ void bdrv_refresh_filename(BlockDriverState *bs)
* needs some special format of the options QDict, it needs to * needs some special format of the options QDict, it needs to
* implement the driver-specific bdrv_refresh_filename() function. * implement the driver-specific bdrv_refresh_filename() function.
*/ */
qdict_put_obj(opts, "filename", qdict_put(opts, "filename", qstring_from_str(bs->exact_filename));
QOBJECT(qstring_from_str(bs->exact_filename)));
} }
bs->full_open_options = opts; bs->full_open_options = opts;

4
block/blkdebug.c
View File

@ -693,10 +693,10 @@ static void blkdebug_refresh_filename(BlockDriverState *bs, QDict *options)
} }
opts = qdict_new(); opts = qdict_new();
qdict_put_obj(opts, "driver", QOBJECT(qstring_from_str("blkdebug"))); qdict_put(opts, "driver", qstring_from_str("blkdebug"));
QINCREF(bs->file->bs->full_open_options); QINCREF(bs->file->bs->full_open_options);
qdict_put_obj(opts, "image", QOBJECT(bs->file->bs->full_open_options)); qdict_put(opts, "image", bs->file->bs->full_open_options);
for (e = qdict_first(options); e; e = qdict_next(options, e)) { for (e = qdict_first(options); e; e = qdict_next(options, e)) {
if (strcmp(qdict_entry_key(e), "x-image")) { if (strcmp(qdict_entry_key(e), "x-image")) {

7
block/blkverify.c
View File

@ -288,13 +288,12 @@ static void blkverify_refresh_filename(BlockDriverState *bs, QDict *options)
&& s->test_file->bs->full_open_options) && s->test_file->bs->full_open_options)
{ {
QDict *opts = qdict_new(); QDict *opts = qdict_new();
qdict_put_obj(opts, "driver", QOBJECT(qstring_from_str("blkverify"))); qdict_put(opts, "driver", qstring_from_str("blkverify"));
QINCREF(bs->file->bs->full_open_options); QINCREF(bs->file->bs->full_open_options);
qdict_put_obj(opts, "raw", QOBJECT(bs->file->bs->full_open_options)); qdict_put(opts, "raw", bs->file->bs->full_open_options);
QINCREF(s->test_file->bs->full_open_options); QINCREF(s->test_file->bs->full_open_options);
qdict_put_obj(opts, "test", qdict_put(opts, "test", s->test_file->bs->full_open_options);
QOBJECT(s->test_file->bs->full_open_options));
bs->full_open_options = opts; bs->full_open_options = opts;
} }

6
block/file-posix.c
View File

@ -375,7 +375,7 @@ static void raw_parse_filename(const char *filename, QDict *options,
* function call can be ignored. */ * function call can be ignored. */
strstart(filename, "file:", &filename); strstart(filename, "file:", &filename);
qdict_put_obj(options, "filename", QOBJECT(qstring_from_str(filename))); qdict_put(options, "filename", qstring_from_str(filename));
} }
static QemuOptsList raw_runtime_opts = { static QemuOptsList raw_runtime_opts = {
@ -2155,7 +2155,7 @@ static void hdev_parse_filename(const char *filename, QDict *options,
/* The prefix is optional, just as for "file". */ /* The prefix is optional, just as for "file". */
strstart(filename, "host_device:", &filename); strstart(filename, "host_device:", &filename);
qdict_put_obj(options, "filename", QOBJECT(qstring_from_str(filename))); qdict_put(options, "filename", qstring_from_str(filename));
} }
static bool hdev_is_sg(BlockDriverState *bs) static bool hdev_is_sg(BlockDriverState *bs)
@ -2454,7 +2454,7 @@ static void cdrom_parse_filename(const char *filename, QDict *options,
/* The prefix is optional, just as for "file". */ /* The prefix is optional, just as for "file". */
strstart(filename, "host_cdrom:", &filename); strstart(filename, "host_cdrom:", &filename);
qdict_put_obj(options, "filename", QOBJECT(qstring_from_str(filename))); qdict_put(options, "filename", qstring_from_str(filename));
} }
#endif #endif

4
block/file-win32.c
View File

@ -281,7 +281,7 @@ static void raw_parse_filename(const char *filename, QDict *options,
* function call can be ignored. */ * function call can be ignored. */
strstart(filename, "file:", &filename); strstart(filename, "file:", &filename);
qdict_put_obj(options, "filename", QOBJECT(qstring_from_str(filename))); qdict_put(options, "filename", qstring_from_str(filename));
} }
static QemuOptsList raw_runtime_opts = { static QemuOptsList raw_runtime_opts = {
@ -668,7 +668,7 @@ static void hdev_parse_filename(const char *filename, QDict *options,
/* The prefix is optional, just as for "file". */ /* The prefix is optional, just as for "file". */
strstart(filename, "host_device:", &filename); strstart(filename, "host_device:", &filename);
qdict_put_obj(options, "filename", QOBJECT(qstring_from_str(filename))); qdict_put(options, "filename", qstring_from_str(filename));
} }
static int hdev_open(BlockDriverState *bs, QDict *options, int flags, static int hdev_open(BlockDriverState *bs, QDict *options, int flags,

16
block/quorum.c
View File

@ -1096,19 +1096,15 @@ static void quorum_refresh_filename(BlockDriverState *bs, QDict *options)
children = qlist_new(); children = qlist_new();
for (i = 0; i < s->num_children; i++) { for (i = 0; i < s->num_children; i++) {
QINCREF(s->children[i]->bs->full_open_options); QINCREF(s->children[i]->bs->full_open_options);
qlist_append_obj(children, qlist_append(children, s->children[i]->bs->full_open_options);
QOBJECT(s->children[i]->bs->full_open_options));
} }
opts = qdict_new(); opts = qdict_new();
qdict_put_obj(opts, "driver", QOBJECT(qstring_from_str("quorum"))); qdict_put(opts, "driver", qstring_from_str("quorum"));
qdict_put_obj(opts, QUORUM_OPT_VOTE_THRESHOLD, qdict_put(opts, QUORUM_OPT_VOTE_THRESHOLD, qint_from_int(s->threshold));
QOBJECT(qint_from_int(s->threshold))); qdict_put(opts, QUORUM_OPT_BLKVERIFY, qbool_from_bool(s->is_blkverify));
qdict_put_obj(opts, QUORUM_OPT_BLKVERIFY, qdict_put(opts, QUORUM_OPT_REWRITE, qbool_from_bool(s->rewrite_corrupted));
QOBJECT(qbool_from_bool(s->is_blkverify))); qdict_put(opts, "children", children);
qdict_put_obj(opts, QUORUM_OPT_REWRITE,
QOBJECT(qbool_from_bool(s->rewrite_corrupted)));
qdict_put_obj(opts, "children", QOBJECT(children));
bs->full_open_options = opts; bs->full_open_options = opts;
} }

20
tests/check-qdict.c
View File

@ -47,7 +47,7 @@ static void qdict_put_obj_test(void)
qdict = qdict_new(); qdict = qdict_new();
// key "" will have tdb hash 12345 // key "" will have tdb hash 12345
qdict_put_obj(qdict, "", QOBJECT(qint_from_int(num))); qdict_put(qdict, "", qint_from_int(num));
g_assert(qdict_size(qdict) == 1); g_assert(qdict_size(qdict) == 1);
ent = QLIST_FIRST(&qdict->table[12345 % QDICT_BUCKET_MAX]); ent = QLIST_FIRST(&qdict->table[12345 % QDICT_BUCKET_MAX]);
@ -66,8 +66,8 @@ static void qdict_destroy_simple_test(void)
QDict *qdict; QDict *qdict;
qdict = qdict_new(); qdict = qdict_new();
qdict_put_obj(qdict, "num", QOBJECT(qint_from_int(0))); qdict_put(qdict, "num", qint_from_int(0));
qdict_put_obj(qdict, "str", QOBJECT(qstring_from_str("foo"))); qdict_put(qdict, "str", qstring_from_str("foo"));
QDECREF(qdict); QDECREF(qdict);
} }
@ -297,16 +297,16 @@ static void qdict_flatten_test(void)
qdict_put(dict1, "a", qint_from_int(0)); qdict_put(dict1, "a", qint_from_int(0));
qdict_put(dict1, "b", qint_from_int(1)); qdict_put(dict1, "b", qint_from_int(1));
qlist_append_obj(list1, QOBJECT(qint_from_int(23))); qlist_append(list1, qint_from_int(23));
qlist_append_obj(list1, QOBJECT(qint_from_int(66))); qlist_append(list1, qint_from_int(66));
qlist_append_obj(list1, QOBJECT(dict1)); qlist_append(list1, dict1);
qlist_append_obj(list2, QOBJECT(qint_from_int(42))); qlist_append(list2, qint_from_int(42));
qlist_append_obj(list2, QOBJECT(list1)); qlist_append(list2, list1);
qdict_put(dict2, "c", qint_from_int(2)); qdict_put(dict2, "c", qint_from_int(2));
qdict_put(dict2, "d", qint_from_int(3)); qdict_put(dict2, "d", qint_from_int(3));
qdict_put_obj(dict3, "e", QOBJECT(list2)); qdict_put(dict3, "e", list2);
qdict_put_obj(dict3, "f", QOBJECT(dict2)); qdict_put(dict3, "f", dict2);
qdict_put(dict3, "g", qint_from_int(4)); qdict_put(dict3, "g", qint_from_int(4));
qdict_flatten(dict3); qdict_flatten(dict3);

24
tests/test-qmp-commands.c
View File

@ -94,7 +94,7 @@ static void test_dispatch_cmd(void)
QDict *req = qdict_new(); QDict *req = qdict_new();
QObject *resp; QObject *resp;
qdict_put_obj(req, "execute", QOBJECT(qstring_from_str("user_def_cmd"))); qdict_put(req, "execute", qstring_from_str("user_def_cmd"));
resp = qmp_dispatch(&qmp_commands, QOBJECT(req)); resp = qmp_dispatch(&qmp_commands, QOBJECT(req));
assert(resp != NULL); assert(resp != NULL);
@ -111,7 +111,7 @@ static void test_dispatch_cmd_failure(void)
QDict *args = qdict_new(); QDict *args = qdict_new();
QObject *resp; QObject *resp;
qdict_put_obj(req, "execute", QOBJECT(qstring_from_str("user_def_cmd2"))); qdict_put(req, "execute", qstring_from_str("user_def_cmd2"));
resp = qmp_dispatch(&qmp_commands, QOBJECT(req)); resp = qmp_dispatch(&qmp_commands, QOBJECT(req));
assert(resp != NULL); assert(resp != NULL);
@ -125,7 +125,7 @@ static void test_dispatch_cmd_failure(void)
qdict_put(args, "a", qint_from_int(66)); qdict_put(args, "a", qint_from_int(66));
qdict_put(req, "arguments", args); qdict_put(req, "arguments", args);
qdict_put_obj(req, "execute", QOBJECT(qstring_from_str("user_def_cmd"))); qdict_put(req, "execute", qstring_from_str("user_def_cmd"));
resp = qmp_dispatch(&qmp_commands, QOBJECT(req)); resp = qmp_dispatch(&qmp_commands, QOBJECT(req));
assert(resp != NULL); assert(resp != NULL);
@ -164,14 +164,14 @@ static void test_dispatch_cmd_io(void)
QDict *ret_dict_dict2, *ret_dict_dict2_userdef; QDict *ret_dict_dict2, *ret_dict_dict2_userdef;
QInt *ret3; QInt *ret3;
qdict_put_obj(ud1a, "integer", QOBJECT(qint_from_int(42))); qdict_put(ud1a, "integer", qint_from_int(42));
qdict_put_obj(ud1a, "string", QOBJECT(qstring_from_str("hello"))); qdict_put(ud1a, "string", qstring_from_str("hello"));
qdict_put_obj(ud1b, "integer", QOBJECT(qint_from_int(422))); qdict_put(ud1b, "integer", qint_from_int(422));
qdict_put_obj(ud1b, "string", QOBJECT(qstring_from_str("hello2"))); qdict_put(ud1b, "string", qstring_from_str("hello2"));
qdict_put_obj(args, "ud1a", QOBJECT(ud1a)); qdict_put(args, "ud1a", ud1a);
qdict_put_obj(args, "ud1b", QOBJECT(ud1b)); qdict_put(args, "ud1b", ud1b);
qdict_put_obj(req, "arguments", QOBJECT(args)); qdict_put(req, "arguments", args);
qdict_put_obj(req, "execute", QOBJECT(qstring_from_str("user_def_cmd2"))); qdict_put(req, "execute", qstring_from_str("user_def_cmd2"));
ret = qobject_to_qdict(test_qmp_dispatch(req)); ret = qobject_to_qdict(test_qmp_dispatch(req));
@ -244,7 +244,7 @@ static void test_dealloc_partial(void)
Visitor *v; Visitor *v;
ud2_dict = qdict_new(); ud2_dict = qdict_new();
qdict_put_obj(ud2_dict, "string0", QOBJECT(qstring_from_str(text))); qdict_put(ud2_dict, "string0", qstring_from_str(text));
v = qobject_input_visitor_new(QOBJECT(ud2_dict)); v = qobject_input_visitor_new(QOBJECT(ud2_dict));
visit_type_UserDefTwo(v, NULL, &ud2, &err); visit_type_UserDefTwo(v, NULL, &ud2, &err);