[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 3/7] qapi: Replace qobject_to_X(o) by qobject
From: |
Eric Blake |
Subject: |
Re: [Qemu-devel] [PATCH v3 3/7] qapi: Replace qobject_to_X(o) by qobject_to(o, X) |
Date: |
Sat, 24 Feb 2018 15:04:53 -0600 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 |
On 02/24/2018 09:40 AM, Max Reitz wrote:
This patch was generated using the following Coccinelle script:
and a bit of manual fix-up for overly long lines and three places in
tests/check-qjson.c that Coccinelle did not find.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
---
diff --git a/block.c b/block.c
index 814e5a02da..cb69fd7ae4 100644
--- a/block.c
+++ b/block.c
@@ -1457,7 +1457,7 @@ static QDict *parse_json_filename(const char *filename,
Error **errp)
return NULL;
}
- options = qobject_to_qdict(options_obj);
+ options = qobject_to(options_obj, QDict);
Bikeshedding - would it read any easier as:
options = qobject_to(QDict, options_obj);
? If so, your Coccinelle script can be touched up, and patch 2/7 swaps
argument order around, so it would be tolerable but still slightly
busywork to regenerate the series. But I'm not strongly attached to
either order, and so I'm also willing to take this as-is (especially
since that's less work), if no one else has a strong opinion that
swapping order would aid legibility.
Reviewed-by: Eric Blake <address@hidden>
+++ b/block/rbd.c
@@ -256,14 +256,14 @@ static int qemu_rbd_set_keypairs(rados_t cluster, const
char *keypairs_json,
if (!keypairs_json) {
return ret;
}
- keypairs = qobject_to_qlist(qobject_from_json(keypairs_json,
- &error_abort));
+ keypairs = qobject_to(qobject_from_json(keypairs_json, &error_abort),
+ QList);
The question about legibility gets a bit more obvious when you span lines.
@@ -893,8 +893,9 @@ static void simple_number(void)
QNum *qnum;
int64_t val;
- qnum = qobject_to_qnum(qobject_from_json(test_cases[i].encoded,
- &error_abort));
+ qnum = qobject_to(qobject_from_json(test_cases[i].encoded,
+ &error_abort),
+ QNum);
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
- Re: [Qemu-devel] [PATCH v3 2/7] qapi: Add qobject_to(), (continued)
- [Qemu-devel] [PATCH v3 4/7] qapi: Remove qobject_to_X() functions, Max Reitz, 2018/02/24
- [Qemu-devel] [PATCH v3 6/7] block: Handle null backing link, Max Reitz, 2018/02/24
- [Qemu-devel] [PATCH v3 5/7] qapi: Make more of qobject_to(), Max Reitz, 2018/02/24
- [Qemu-devel] [PATCH v3 7/7] block: Deprecate "backing": "", Max Reitz, 2018/02/24
- [Qemu-devel] [PATCH v3 3/7] qapi: Replace qobject_to_X(o) by qobject_to(o, X), Max Reitz, 2018/02/24
- Re: [Qemu-devel] [PATCH v3 3/7] qapi: Replace qobject_to_X(o) by qobject_to(o, X),
Eric Blake <=
Re: [Qemu-devel] [PATCH v3 0/7] block: Handle null backing link, no-reply, 2018/02/24
Re: [Qemu-devel] [PATCH v3 0/7] block: Handle null backing link, no-reply, 2018/02/24
Re: [Qemu-devel] [PATCH v3 0/7] block: Handle null backing link, no-reply, 2018/02/24
Re: [Qemu-devel] [PATCH v3 0/7] block: Handle null backing link, no-reply, 2018/02/24
Re: [Qemu-devel] [PATCH v3 0/7] block: Handle null backing link, no-reply, 2018/02/25
Re: [Qemu-devel] [PATCH v3 0/7] block: Handle null backing link, no-reply, 2018/02/26