block: Handle null backing link
v2 cover block: Handle null backing link
Currently, we try to rewrite every occurrence of "backing": null into "backing": "" in qmp_blockdev_add(). However, that breaks using the same "backing": null construction in json:{} file names (which do not go through qmp_blockdev_add()). Currently, these then just behave as if the option has not been specified.
Since there is actually only one place where we evaluate the @backing option to find out whether not to use a backing file, we can instead just check for null there. It doesn't matter that this changes the runtime state of the option from "" to null, because nobody really does anything with that runtime state anyway (except put it into qemu again, but qemu doesn't care whether it's "" or null).
And in the future, it's much better if we get it to be null in that runtime state sooner than later -- see patch 6.
v2: Add qobject_to() macro instead of qdict_is_null() (and then we can
do qobject_to(qdict_get(...), QNull) != NULL instead) [Markus]
- I'm not sure what I came up with is what Markus intended me to, and if it is not, I'm inclined to go back to qdict_is_null() (or qdict_entry_is_null(), as Berto has proposed);
or, alternatively, add a qobject_to_qnull() function and drop patches 2 through 4.
git-backport-diff against v1:
Key:
[----] : patches are identical
[####] : number of functional differences between upstream/downstream patch [down] : patch is downstream-only
The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively
001/6:[down] 'qapi: Add qobject_to()'
002/6:[down] 'qapi: Replace qobject_to_X(o) by qobject_to(o, X)' 003/6:[down] 'qapi: Remove qobject_to_X() functions' 004/6:[down] 'qapi: Make more of qobject_to()' 005/6:[0004] [FC] 'block: Handle null backing link' 006/6:[----] [-C] 'block: Deprecate "backing": ""'
Max Reitz (6):
qapi: Add qobject_to()
qapi: Replace qobject_to_X(o) by qobject_to(o, X)
qapi: Remove qobject_to_X() functions
qapi: Make more of qobject_to()
block: Handle null backing link
block: Deprecate "backing": ""
qapi/block-core.json | 4 +-- include/qapi/qmp/qbool.h | 1 - include/qapi/qmp/qdict.h | 1 - include/qapi/qmp/qlist.h | 1 - include/qapi/qmp/qnum.h | 1 - include/qapi/qmp/qobject.h | 32 ++++++++++++++++++ include/qapi/qmp/qstring.h | 1 - block.c | 10 ++++-- block/qapi.c | 12 +++---- block/rbd.c | 8 ++--- blockdev.c | 21 +++--------- hw/i386/acpi-build.c | 14 ++++---- monitor.c | 8 ++--- qapi/qmp-dispatch.c | 2 +- qapi/qobject-input-visitor.c | 24 +++++++------- qapi/qobject-output-visitor.c | 4 +-- qga/main.c | 2 +- qmp.c | 2 +- qobject/json-parser.c | 13 ++++---- qobject/qbool.c | 15 ++------- qobject/qdict.c | 65 ++++++++++++++++--------------------- qobject/qjson.c | 10 +++--- qobject/qlist.c | 17 ++-------- qobject/qlit.c | 10 +++--- qobject/qnum.c | 17 ++-------- qobject/qstring.c | 17 ++-------- qom/object.c | 8 ++--- target/i386/cpu.c | 2 +- target/s390x/cpu_models.c | 2 +- tests/check-qdict.c | 20 ++++++------ tests/check-qjson.c | 41 +++++++++++------------ tests/check-qlist.c | 4 +-- tests/check-qlit.c | 2 +- tests/check-qnum.c | 4 +-- tests/check-qobject.c | 2 +- tests/check-qstring.c | 2 +- tests/device-introspect-test.c | 14 ++++---- tests/libqtest.c | 6 ++-- tests/numa-test.c | 8 ++--- tests/qom-test.c | 4 +-- tests/test-char.c | 2 +- tests/test-keyval.c | 8 ++--- tests/test-qga.c | 19 ++++++----- tests/test-qmp-commands.c | 12 +++---- tests/test-qmp-event.c | 16 ++++----- tests/test-qobject-input-visitor.c | 10 +++--- tests/test-qobject-output-visitor.c | 54 +++++++++++++++--------------- tests/test-x86-cpuid-compat.c | 17 +++++----- util/keyval.c | 4 +-- util/qemu-config.c | 2 +- util/qemu-option.c | 6 ++-- qemu-doc.texi | 7 ++++ qemu-options.hx | 4 +-- tests/qemu-iotests/089 | 20 ++++++++++++ tests/qemu-iotests/089.out | 8 +++++ 55 files changed, 313 insertions(+), 307 deletions(-)
Signature · 1 line
2.14.3
PATCH v2 1/6 qapi: Add qobject_to()
This is a dynamic casting macro that, given a QObject type, returns an object as that type or NULL if the object is of a different type (or NULL itself).
The macro uses lower-case letters because:
1. There does not seem to be a hard rule on whether qemu macros have to be upper-cased,
2. The current situation in qapi/qmp is inconsistent (compare e.g. QINCREF() vs. qdict_put()),
3. qobject_to() will evaluate its @obj parameter only once, thus it is generally not important to the caller whether it is a macro or not,
4. I prefer it aesthetically.
---
You're more than welcome to convince me to call it QOBJECT_TO()!
--- include/qapi/qmp/qobject.h | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
include/qapi/qmp/qobject.h +32 -0
@@ -50,6 +50,24 @@ struct QObject {#define QDECREF (obj) \ qobject_decref(obj ? QOBJECT(obj) : NULL) +/* Required for qobject_to() */ +#define QTYPE_CAST_TO_QNull QTYPE_QNULL +#define QTYPE_CAST_TO_QNum QTYPE_QNUM +#define QTYPE_CAST_TO_QString QTYPE_QSTRING +#define QTYPE_CAST_TO_QDict QTYPE_QDICT +#define QTYPE_CAST_TO_QList QTYPE_QLIST +#define QTYPE_CAST_TO_QBool QTYPE_QBOOL + +#ifdef CONFIG_STATIC_ASSERT +_Static_assert (QTYPE__MAX ==7 , +"The QTYPE_CAST_TO_* list needs to be extended" ); +#endif + +#define qobject_to (obj, type) \ + container_of(qobject_check_type(obj, glue(QTYPE_CAST_TO_, type)) ?: \ + QOBJECT((type *)NULL), \ + type, base) +/* Initialize an object to default values */ static inline void qobject_init (QObject *obj,QType type) {
@@ -102,4 +120,18 @@ static inline QType qobject_type(const QObject *obj) return obj->type; } +/** +* qobject_check_type(): Helper function for the qobject_to() macro. +* Return @obj, but only if @obj is not NULL and @type is equal to +* @obj's type. Return NULL otherwise. +*/ +static inline QObject *qobject_check_type (const QObject *obj,QType type) +{ +if (obj &&qobject_type (obj) == type) { +return (QObject *)obj; + }else { +return NULL ; + } +} +#endif /* QOBJECT_H */
Signature · 1 line
2.14.3
Re: [Qemu-devel] [PATCH v2 1/6] qapi: Add qobject_to()
Quoted 13 lines · Max Reitz
This is a dynamic casting macro that, given a QObject type, returns an object as that type or NULL if the object is of a different type (or NULL itself).
The macro uses lower-case letters because:
1. There does not seem to be a hard rule on whether qemu macros have to be upper-cased,
2. The current situation in qapi/qmp is inconsistent (compare e.g.QINCREF()vs.qdict_put()),
3.qobject_to()will evaluate its @obj parameter only once, thus it is generally not important to the caller whether it is a macro or not,
4. I prefer it aesthetically.
Quoted 3 lines
Signed-off-by Max Reitz <[email protected]>---
You're more than welcome to convince me to call itQOBJECT_TO()!
I can live with the lower-case version; especially with your good list of reasons for it ;)
Quoted 14 lines
--- include/qapi/qmp/qobject.h | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)include/qapi/qmp/qobject.h +2
-0@@ -50,6 +50,24 @@ struct QObject {#define QDECREF (obj) \ qobject_decref(obj ? QOBJECT(obj) : NULL) +/* Required for qobject_to() */ +#define QTYPE_CAST_TO_QNull QTYPE_QNULL
include/qapi/qmp/qobject.h struct QObject { · line 64
Quoted 10 lines
include/qapi/qmp/qobject.h +10
-0+#define QTYPE_CAST_TO_QNum QTYPE_QNUM +#define QTYPE_CAST_TO_QString QTYPE_QSTRING +#define QTYPE_CAST_TO_QDict QTYPE_QDICT +#define QTYPE_CAST_TO_QList QTYPE_QLIST +#define QTYPE_CAST_TO_QBool QTYPE_QBOOL + +#ifdef CONFIG_STATIC_ASSERT +_Static_assert (QTYPE__MAX ==7 , +"The QTYPE_CAST_TO_* list needs to be extended" ); +#endif
Why not use QEMU_BUILD_BUG_ON() instead of _Static_assert? That way, this check will break the build even on older compilers that lack _Static_assert but where we still know how to trigger a build failure.
include/qapi/qmp/qobject.h struct QObject { · line 69
Quoted 5 lines
include/qapi/qmp/qobject.h +5
-0+ +#define qobject_to (obj, type) \ + container_of(qobject_check_type(obj, glue(QTYPE_CAST_TO_, type)) ?: \ + QOBJECT((type *)NULL), \ + type, base)
Slick!
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [Qemu-devel] [PATCH v2 1/6] qapi: Add qobject_to()
Quoted 33 lines · Eric Blake
Quoted 13 lines · Max Reitz
This is a dynamic casting macro that, given a QObject type, returns an object as that type or NULL if the object is of a different type (or NULL itself).
The macro uses lower-case letters because:
1. There does not seem to be a hard rule on whether qemu macros have to be upper-cased,
2. The current situation in qapi/qmp is inconsistent (compare e.g.QINCREF()vs.qdict_put()),
3.qobject_to()will evaluate its @obj parameter only once, thus it is generally not important to the caller whether it is a macro or not,
4. I prefer it aesthetically.Quoted 3 lines
Signed-off-by Max Reitz <[email protected]>---
You're more than welcome to convince me to call itQOBJECT_TO()!I can live with the lower-case version; especially with your good list of reasons for it ;)
Quoted 12 lines
--- include/qapi/qmp/qobject.h | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)include/qapi/qmp/qobject.h +0
-0@@ -50,6 +50,24 @@ struct QObject {#define QDECREF (obj) \ qobject_decref(obj ? QOBJECT(obj) : NULL)
Quoted 16 lines
include/qapi/qmp/qobject.h struct QObject { · line 64
Quoted 12 lines
include/qapi/qmp/qobject.h +12
-0+/* Required for qobject_to() */ +#define QTYPE_CAST_TO_QNull QTYPE_QNULL +#define QTYPE_CAST_TO_QNum QTYPE_QNUM +#define QTYPE_CAST_TO_QString QTYPE_QSTRING +#define QTYPE_CAST_TO_QDict QTYPE_QDICT +#define QTYPE_CAST_TO_QList QTYPE_QLIST +#define QTYPE_CAST_TO_QBool QTYPE_QBOOL + +#ifdef CONFIG_STATIC_ASSERT +_Static_assert (QTYPE__MAX ==7 , +"The QTYPE_CAST_TO_* list needs to be extended" ); +#endif Why not use
QEMU_BUILD_BUG_ON()instead of_Static_assert? That way, this check will break the build even on older compilers that lack_Static_assertbut where we still know how to trigger a build failure.
One reason would be because _Static_assert() allows me to give a nice warning message -- I could add a comment above the QEMU_BUILD_BUG_ON() line and hope for the best, but still, I like that better.
The other is that I assumed most people would be using C11 compilers now, so the omission would be spotted sufficiently early. "Sufficiently" because it's actually not that bad for this list to be incomplete. The worst is that you can't use qobject_to() for your desired target type, but that's hardly catastrophic.
I could add an #else branch with QEMU_BUILD_BUG_ON(). Or I could add a QEMU_BUILD_BUG_MSG() macro that takes a message (which is omitted if you don't have _Static_assert() but would still make for a nice comment). I guess the latter would be a nice idea in general...?
Max
Quoted 8 lines
include/qapi/qmp/qobject.h struct QObject { · line 69
Quoted 5 lines
include/qapi/qmp/qobject.h +5
-0+ +#define qobject_to (obj, type) \ + container_of(qobject_check_type(obj, glue(QTYPE_CAST_TO_, type)) ?: \ + QOBJECT((type *)NULL), \ + type, base)Slick!
Re: [Qemu-devel] [PATCH v2 1/6] qapi: Add qobject_to()
In reply to Max ReitzQuoted 13 lines · Max Reitz
This is a dynamic casting macro that, given a QObject type, returns an object as that type or NULL if the object is of a different type (or NULL itself).
The macro uses lower-case letters because:
1. There does not seem to be a hard rule on whether qemu macros have to be upper-cased,
2. The current situation in qapi/qmp is inconsistent (compare e.g.QINCREF()vs.qdict_put()),
3.qobject_to()will evaluate its @obj parameter only once, thus it is generally not important to the caller whether it is a macro or not,
4. I prefer it aesthetically.
Quoted 1 line
Signed-off-by Max Reitz <[email protected]>
Berto
PATCH v2 2/6 qapi: Replace qobject_to_X(o) by qobject_to(o, X)
In reply to Max ReitzThis patch was generated using the following Coccinelle script:
@@
expression Obj;
@@
(
- qobject_to_qnum(Obj)
+ qobject_to(Obj, QNum)
|
- qobject_to_qstring(Obj)
+ qobject_to(Obj, QString)
|
- qobject_to_qdict(Obj)
+ qobject_to(Obj, QDict)
|
- qobject_to_qlist(Obj)
+ qobject_to(Obj, QList)
|
- qobject_to_qbool(Obj)
+ qobject_to(Obj, QBool)
)
and a bit of manual fix-up for overly long lines and three places in tests/check-qjson.c that Coccinelle did not find.
--- block.c | 2 +- block/qapi.c | 12 ++++----- block/rbd.c | 8 +++--- blockdev.c | 7 ++--- hw/i386/acpi-build.c | 14 +++++----- monitor.c | 8 +++--- qapi/qmp-dispatch.c | 2 +- qapi/qobject-input-visitor.c | 20 +++++++------- qapi/qobject-output-visitor.c | 4 +-- qga/main.c | 2 +- qmp.c | 2 +- qobject/json-parser.c | 2 +- qobject/qbool.c | 4 +-- qobject/qdict.c | 38 +++++++++++++------------- qobject/qjson.c | 10 +++---- qobject/qlist.c | 6 ++--- qobject/qlit.c | 10 +++---- qobject/qnum.c | 6 ++--- qobject/qstring.c | 6 ++--- qom/object.c | 8 +++--- target/i386/cpu.c | 2 +- target/s390x/cpu_models.c | 2 +- tests/check-qdict.c | 20 +++++++------- tests/check-qjson.c | 41 ++++++++++++++-------------- tests/check-qlist.c | 4 +-- tests/check-qlit.c | 2 +- tests/check-qnum.c | 4 +-- tests/check-qobject.c | 2 +- tests/check-qstring.c | 2 +- tests/device-introspect-test.c | 14 +++++----- tests/libqtest.c | 6 ++--- tests/numa-test.c | 8 +++--- tests/qom-test.c | 4 +-- tests/test-char.c | 2 +- tests/test-keyval.c | 8 +++--- tests/test-qga.c | 19 ++++++------- tests/test-qmp-commands.c | 12 ++++----- tests/test-qmp-event.c | 16 +++++------ tests/test-qobject-input-visitor.c | 10 +++---- tests/test-qobject-output-visitor.c | 54 ++++++++++++++++++------------------- tests/test-x86-cpuid-compat.c | 17 ++++++------ util/keyval.c | 4 +-- util/qemu-config.c | 2 +- util/qemu-option.c | 6 ++--- 44 files changed, 218 insertions(+), 214 deletions(-)
block.c +1 -1
@@ -1454,7 +1454,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);if (!options) {qobject_decref (options_obj);error_setg (errp,"Invalid JSON object given" );
block/qapi.c +6 -6
@@ -642,29 +642,29 @@ static void dump_qobject(fprintf_function func_fprintf, void *f, {switch (qobject_type (obj)) {case QTYPE_QNUM : { -QNum *value =qobject_to_qnum (obj); +QNum *value =qobject_to (obj, QNum);char *tmp =qnum_to_string (value);func_fprintf (f,"%s" , tmp);g_free (tmp);break ; }case QTYPE_QSTRING : { -QString *value =qobject_to_qstring (obj); +QString *value =qobject_to (obj, QString);func_fprintf (f,"%s" ,qstring_get_str (value));break ; }case QTYPE_QDICT : { -QDict *value =qobject_to_qdict (obj); +QDict *value =qobject_to (obj, QDict);dump_qdict (func_fprintf, f, comp_indent, value);break ; }case QTYPE_QLIST : { -QList *value =qobject_to_qlist (obj); +QList *value =qobject_to (obj, QList);dump_qlist (func_fprintf, f, comp_indent, value);break ; }case QTYPE_QBOOL : { -QBool *value =qobject_to_qbool (obj); +QBool *value =qobject_to (obj, QBool);func_fprintf (f,"%s" ,qbool_get_bool (value) ?"true" :"false" );break ; }
@@ -725,7 +725,7 @@ void bdrv_image_info_specific_dump(fprintf_function func_fprintf, void *f,visit_type_ImageInfoSpecific (v,NULL , &info_spec, &error_abort);visit_complete (v, &obj); - data =qdict_get (qobject_to_qdict (obj),"data" ); + data =qdict_get (qobject_to (obj, QDict),"data" );dump_qobject (func_fprintf, f,1 , data);qobject_decref (obj);visit_free (v);
block/rbd.c +4 -4
@@ -253,14 +253,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); remaining =qlist_size (keypairs) /2 ;assert (remaining);while (remaining--) { - name =qobject_to_qstring (qlist_pop (keypairs)); - value =qobject_to_qstring (qlist_pop (keypairs)); + name =qobject_to (qlist_pop (keypairs), QString); + value =qobject_to (qlist_pop (keypairs), QString);assert (name && value); key =qstring_get_str (name);
blockdev.c +4 -3
@@ -329,7 +329,8 @@ static bool parse_stats_intervals(BlockAcctStats *stats, QList *intervals,case QTYPE_QSTRING : {unsigned long long length; -const char *str =qstring_get_str (qobject_to_qstring (entry->value)); +const char *str = +qstring_get_str (qobject_to (entry->value, QString));if (parse_uint_full (str, &length,10 ) ==0 && length >0 && length <=UINT_MAX ) {block_acct_add_interval (stats, (unsigned ) length);
@@ -341,7 +342,7 @@ static bool parse_stats_intervals(BlockAcctStats *stats, QList *intervals, }case QTYPE_QNUM : { -int64_t length =qnum_get_int (qobject_to_qnum (entry->value)); +int64_t length =qnum_get_int (qobject_to (entry->value, QNum));if (length >0 && length <=UINT_MAX ) {block_acct_add_interval (stats, (unsigned ) length);
@@ -3978,7 +3979,7 @@ void qmp_blockdev_add(BlockdevOptions *options, Error **errp) }visit_complete (v, &obj); - qdict =qobject_to_qdict (obj); + qdict =qobject_to (obj, QDict);qdict_flatten (qdict);
hw/i386/acpi-build.c +7 -7
@@ -153,21 +153,21 @@ static void acpi_get_pm_info(AcpiPmInfo *pm)/* Fill in optional s3/s4 related properties */ o =object_property_get_qobject (obj,ACPI_PM_PROP_S3_DISABLED ,NULL );if (o) { - pm->s3_disabled =qnum_get_uint (qobject_to_qnum (o)); + pm->s3_disabled =qnum_get_uint (qobject_to (o, QNum)); }else { pm->s3_disabled = false; }qobject_decref (o); o =object_property_get_qobject (obj,ACPI_PM_PROP_S4_DISABLED ,NULL );if (o) { - pm->s4_disabled =qnum_get_uint (qobject_to_qnum (o)); + pm->s4_disabled =qnum_get_uint (qobject_to (o, QNum)); }else { pm->s4_disabled = false; }qobject_decref (o); o =object_property_get_qobject (obj,ACPI_PM_PROP_S4_VAL ,NULL );if (o) { - pm->s4_val =qnum_get_uint (qobject_to_qnum (o)); + pm->s4_val =qnum_get_uint (qobject_to (o, QNum)); }else { pm->s4_val = false; }
@@ -513,7 +513,7 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus, bsel =object_property_get_qobject (OBJECT (bus),ACPI_PCIHP_PROP_BSEL ,NULL );if (bsel) { -uint64_t bsel_val =qnum_get_uint (qobject_to_qnum (bsel)); +uint64_t bsel_val =qnum_get_uint (qobject_to (bsel, QNum));aml_append (parent_scope,aml_name_decl ("BSEL" ,aml_int (bsel_val))); notify_method =aml_method ("DVNT" ,2 ,AML_NOTSERIALIZED );
@@ -623,7 +623,7 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,/* If bus supports hotplug select it and notify about local events */ if (bsel) { -uint64_t bsel_val =qnum_get_uint (qobject_to_qnum (bsel)); +uint64_t bsel_val =qnum_get_uint (qobject_to (bsel, QNum));aml_append (method,aml_store (aml_int (bsel_val),aml_name ("BNUM" ))); aml_append(method,
@@ -2619,12 +2619,12 @@ static bool acpi_get_mcfg(AcpiMcfgInfo *mcfg)if (!o) {return false; } - mcfg->mcfg_base =qnum_get_uint (qobject_to_qnum (o)); + mcfg->mcfg_base =qnum_get_uint (qobject_to (o, QNum));qobject_decref (o); o =object_property_get_qobject (pci_host,PCIE_HOST_MCFG_SIZE ,NULL );assert (o); - mcfg->mcfg_size =qnum_get_uint (qobject_to_qnum (o)); + mcfg->mcfg_size =qnum_get_uint (qobject_to (o, QNum));qobject_decref (o);return true; }
monitor.c +4 -4
@@ -444,7 +444,7 @@ monitor_qapi_event_queue(QAPIEvent event, QDict *qdict, Error **errp)/* Unthrottled event */ monitor_qapi_event_emit (event, qdict); }else { -QDict *data =qobject_to_qdict (qdict_get (qdict,"data" )); +QDict *data =qobject_to (qdict_get (qdict,"data" ), QDict);MonitorQAPIEventState key = { .event = event, .data = data }; evstate =g_hash_table_lookup (monitor_qapi_event_state, &key);
@@ -3823,7 +3823,7 @@ static void handle_qmp_command(JSONMessageParser *parser, GQueue *tokens) goto err_out; } - qdict =qobject_to_qdict (req); + qdict =qobject_to (req, QDict);if (qdict) { id =qdict_get (qdict,"id" );qobject_incref (id);
@@ -3839,7 +3839,7 @@ static void handle_qmp_command(JSONMessageParser *parser, GQueue *tokens) rsp =qmp_dispatch (cur_mon->qmp.commands, req);if (mon->qmp.commands == &qmp_cap_negotiation_commands) { - qdict =qdict_get_qdict (qobject_to_qdict (rsp),"error" ); + qdict =qdict_get_qdict (qobject_to (rsp, QDict),"error" );if (qdict && !g_strcmp0 (qdict_get_try_str (qdict,"class" ),QapiErrorClass_str (ERROR_CLASS_COMMAND_NOT_FOUND ))) {
@@ -3860,7 +3860,7 @@ err_out:if (rsp) {if (id) { -qdict_put_obj (qobject_to_qdict (rsp),"id" , id); +qdict_put_obj (qobject_to (rsp, QDict),"id" , id); id =NULL ; }
qapi/qmp-dispatch.c +1 -1
@@ -28,7 +28,7 @@ static QDict *qmp_dispatch_check_obj(const QObject *request, Error **errp)bool has_exec_key = false;QDict *dict =NULL ; - dict =qobject_to_qdict (request); + dict =qobject_to (request, QDict);if (!dict) {error_setg (errp,"QMP input must be a JSON object" );return NULL ;
qapi/qobject-input-visitor.c +10 -10
@@ -132,7 +132,7 @@ static QObject *qobject_input_try_get_object(QObjectInputVisitor *qiv,if (qobject_type (qobj) ==QTYPE_QDICT ) {assert (name); - ret =qdict_get (qobject_to_qdict (qobj), name); + ret =qdict_get (qobject_to (qobj, QDict), name);if (tos->h && consume && ret) {bool removed =g_hash_table_remove (tos->h, name);assert (removed);
@@ -180,7 +180,7 @@ static const char *qobject_input_get_keyval(QObjectInputVisitor *qiv,return NULL ; } - qstr =qobject_to_qstring (qobj); + qstr =qobject_to (qobj, QString);if (!qstr) {switch (qobject_type (qobj)) {case QTYPE_QDICT :
@@ -219,11 +219,11 @@ static const QListEntry *qobject_input_push(QObjectInputVisitor *qiv,if (qobject_type (obj) ==QTYPE_QDICT ) { h =g_hash_table_new (g_str_hash, g_str_equal); -qdict_iter (qobject_to_qdict (obj), qdict_add_key, h); +qdict_iter (qobject_to (obj, QDict), qdict_add_key, h); tos->h = h; }else {assert (qobject_type (obj) ==QTYPE_QLIST ); - tos->entry =qlist_first (qobject_to_qlist (obj)); + tos->entry =qlist_first (qobject_to (obj, QList)); tos->index =-1 ; }
@@ -390,7 +390,7 @@ static void qobject_input_type_int64(Visitor *v, const char *name, int64_t *obj,if (!qobj) {return ; } - qnum =qobject_to_qnum (qobj); + qnum =qobject_to (qobj, QNum);if (!qnum || !qnum_get_try_int (qnum, obj)) {error_setg (errp,QERR_INVALID_PARAMETER_TYPE ,full_name (qiv, name),"integer" );
@@ -425,7 +425,7 @@ static void qobject_input_type_uint64(Visitor *v, const char *name,if (!qobj) {return ; } - qnum =qobject_to_qnum (qobj); + qnum =qobject_to (qobj, QNum);if (!qnum) { goto err; }
@@ -472,7 +472,7 @@ static void qobject_input_type_bool(Visitor *v, const char *name, bool *obj,if (!qobj) {return ; } - qbool =qobject_to_qbool (qobj); + qbool =qobject_to (qobj, QBool);if (!qbool) {error_setg (errp,QERR_INVALID_PARAMETER_TYPE ,full_name (qiv, name),"boolean" );
@@ -513,7 +513,7 @@ static void qobject_input_type_str(Visitor *v, const char *name, char **obj,if (!qobj) {return ; } - qstr =qobject_to_qstring (qobj); + qstr =qobject_to (qobj, QString);if (!qstr) {error_setg (errp,QERR_INVALID_PARAMETER_TYPE ,full_name (qiv, name),"string" );
@@ -542,7 +542,7 @@ static void qobject_input_type_number(Visitor *v, const char *name, double *obj,if (!qobj) {return ; } - qnum =qobject_to_qnum (qobj); + qnum =qobject_to (qobj, QNum);if (!qnum) {error_setg (errp,QERR_INVALID_PARAMETER_TYPE ,full_name (qiv, name),"number" );
@@ -729,7 +729,7 @@ Visitor *qobject_input_visitor_new_str(const char *str, }return NULL ; } - args =qobject_to_qdict (obj); + args =qobject_to (obj, QDict);assert (args); v =qobject_input_visitor_new (QOBJECT (args)); }else {
qapi/qobject-output-visitor.c +2 -2
@@ -87,11 +87,11 @@ static void qobject_output_add_obj(QObjectOutputVisitor *qov, const char *name,switch (qobject_type (cur)) {case QTYPE_QDICT :assert (name); -qdict_put_obj (qobject_to_qdict (cur), name, value); +qdict_put_obj (qobject_to (cur, QDict), name, value);break ;case QTYPE_QLIST :assert (!name); -qlist_append_obj (qobject_to_qlist (cur), value); +qlist_append_obj (qobject_to (cur, QList), value);break ;default :g_assert_not_reached ();
qga/main.c +1 -1
@@ -603,7 +603,7 @@ static void process_event(JSONMessageParser *parser, GQueue *tokens)g_assert (s && parser);g_debug ("process_event: called" ); - qdict =qobject_to_qdict (json_parser_parse_err (tokens,NULL , &err)); + qdict =qobject_to (json_parser_parse_err (tokens,NULL , &err), QDict);if (err || !qdict) {QDECREF (qdict); qdict =qdict_new ();
qmp.c +1 -1
@@ -652,7 +652,7 @@ void qmp_object_add(const char *type, const char *id,Object *obj;if (props) { - pdict =qobject_to_qdict (props); + pdict =qobject_to (props, QDict);if (!pdict) {error_setg (errp,QERR_INVALID_PARAMETER_TYPE ,"props" ,"dict" );return ;
qobject/json-parser.c +1 -1
@@ -303,7 +303,7 @@ static int parse_pair(JSONParserContext *ctxt, QDict *dict, va_list *ap) goto out; } -qdict_put_obj (dict,qstring_get_str (qobject_to_qstring (key)), value); +qdict_put_obj (dict,qstring_get_str (qobject_to (key, QString)), value);qobject_decref (key);
qobject/qbool.c +2 -2
@@ -56,7 +56,7 @@ QBool *qobject_to_qbool(const QObject *obj)*/ bool qbool_is_equal (const QObject *x,const QObject *y) { -return qobject_to_qbool (x)->value ==qobject_to_qbool (y)->value; +return qobject_to (x, QBool)->value ==qobject_to (y, QBool)->value; }/**
@@ -66,5 +66,5 @@ bool qbool_is_equal(const QObject *x, const QObject *y)void qbool_destroy_obj (QObject *obj) {assert (obj !=NULL ); -g_free (qobject_to_qbool (obj)); +g_free (qobject_to (obj, QBool)); }
qobject/qdict.c +19 -19
@@ -185,7 +185,7 @@ size_t qdict_size(const QDict *qdict)*/ double qdict_get_double (const QDict *qdict,const char *key) { -return qnum_get_double (qobject_to_qnum (qdict_get (qdict, key))); +return qnum_get_double (qobject_to (qdict_get (qdict, key), QNum)); }/**
@@ -198,7 +198,7 @@ double qdict_get_double(const QDict *qdict, const char *key)*/ int64_t qdict_get_int (const QDict *qdict,const char *key) { -return qnum_get_int (qobject_to_qnum (qdict_get (qdict, key))); +return qnum_get_int (qobject_to (qdict_get (qdict, key), QNum)); }/**
@@ -211,7 +211,7 @@ int64_t qdict_get_int(const QDict *qdict, const char *key)*/ bool qdict_get_bool (const QDict *qdict,const char *key) { -return qbool_get_bool (qobject_to_qbool (qdict_get (qdict, key))); +return qbool_get_bool (qobject_to (qdict_get (qdict, key), QBool)); }/**
@@ -219,7 +219,7 @@ bool qdict_get_bool(const QDict *qdict, const char *key)*/ QList *qdict_get_qlist (const QDict *qdict,const char *key) { -return qobject_to_qlist (qdict_get (qdict, key)); +return qobject_to (qdict_get (qdict, key), QList); }/**
@@ -227,7 +227,7 @@ QList *qdict_get_qlist(const QDict *qdict, const char *key)*/ QDict *qdict_get_qdict (const QDict *qdict,const char *key) { -return qobject_to_qdict (qdict_get (qdict, key)); +return qobject_to (qdict_get (qdict, key), QDict); }/**
@@ -241,7 +241,7 @@ QDict *qdict_get_qdict(const QDict *qdict, const char *key)*/ const char *qdict_get_str (const QDict *qdict,const char *key) { -return qstring_get_str (qobject_to_qstring (qdict_get (qdict, key))); +return qstring_get_str (qobject_to (qdict_get (qdict, key), QString)); }/**
@@ -254,7 +254,7 @@ const char *qdict_get_str(const QDict *qdict, const char *key)int64_t qdict_get_try_int (const QDict *qdict,const char *key,int64_t def_value) { -QNum *qnum =qobject_to_qnum (qdict_get (qdict, key)); +QNum *qnum =qobject_to (qdict_get (qdict, key), QNum);int64_t val;if (!qnum || !qnum_get_try_int (qnum, &val)) {
@@ -273,7 +273,7 @@ int64_t qdict_get_try_int(const QDict *qdict, const char *key,*/ bool qdict_get_try_bool (const QDict *qdict,const char *key,bool def_value) { -QBool *qbool =qobject_to_qbool (qdict_get (qdict, key)); +QBool *qbool =qobject_to (qdict_get (qdict, key), QBool);return qbool ?qbool_get_bool (qbool) : def_value; }
@@ -288,7 +288,7 @@ bool qdict_get_try_bool(const QDict *qdict, const char *key, bool def_value)*/ const char *qdict_get_try_str (const QDict *qdict,const char *key) { -QString *qstr =qobject_to_qstring (qdict_get (qdict, key)); +QString *qstr =qobject_to (qdict_get (qdict, key), QString);return qstr ?qstring_get_str (qstr) :NULL ; }
@@ -411,8 +411,8 @@ void qdict_del(QDict *qdict, const char *key)*/ bool qdict_is_equal (const QObject *x,const QObject *y) { -const QDict *dict_x =qobject_to_qdict (x); -const QDict *dict_y =qobject_to_qdict (y); +const QDict *dict_x =qobject_to (x, QDict); +const QDict *dict_y =qobject_to (y, QDict);const QDictEntry *e;if (qdict_size (dict_x) !=qdict_size (dict_y)) {
@@ -440,7 +440,7 @@ void qdict_destroy_obj(QObject *obj)QDict *qdict;assert (obj !=NULL ); - qdict =qobject_to_qdict (obj); + qdict =qobject_to (obj, QDict);for (i =0 ; i <QDICT_BUCKET_MAX ; i++) {QDictEntry *entry =QLIST_FIRST (&qdict->table[i]);
@@ -511,9 +511,9 @@ static void qdict_flatten_qlist(QList *qlist, QDict *target, const char *prefix) new_key =g_strdup_printf ("%s.%i" , prefix, i);if (qobject_type (value) ==QTYPE_QDICT ) { -qdict_flatten_qdict (qobject_to_qdict (value), target, new_key); +qdict_flatten_qdict (qobject_to (value, QDict), target, new_key); }else if (qobject_type (value) ==QTYPE_QLIST ) { -qdict_flatten_qlist (qobject_to_qlist (value), target, new_key); +qdict_flatten_qlist (qobject_to (value, QList), target, new_key); }else {/* All other types are moved to the target unchanged. */ qobject_incref (value);
@@ -547,11 +547,11 @@ static void qdict_flatten_qdict(QDict *qdict, QDict *target, const char *prefix)if (qobject_type (value) ==QTYPE_QDICT ) {/* Entries of QDicts are processed recursively, the QDict object * itself disappears. */ -qdict_flatten_qdict (qobject_to_qdict (value), target, +qdict_flatten_qdict (qobject_to (value, QDict), target, new_key ? new_key : entry->key); delete = true; }else if (qobject_type (value) ==QTYPE_QLIST ) { -qdict_flatten_qlist (qobject_to_qlist (value), target, +qdict_flatten_qlist (qobject_to (value, QList), target, new_key ? new_key : entry->key); delete = true; }else if (prefix) {
@@ -883,7 +883,7 @@ QObject *qdict_crumple(const QDict *src, Error **errp)qdict_put_obj (two_level, prefix, child); }qobject_incref (ent->value); -qdict_put_obj (qobject_to_qdict (child), suffix, ent->value); +qdict_put_obj (qobject_to (child, QDict), suffix, ent->value); }else {if (child) { error_setg(errp, "Key %s prefix is already set as a dict",
@@ -905,7 +905,7 @@ QObject *qdict_crumple(const QDict *src, Error **errp) ent = qdict_next(two_level, ent)) {if (qobject_type (ent->value) ==QTYPE_QDICT ) { - child =qdict_crumple (qobject_to_qdict (ent->value), errp); + child =qdict_crumple (qobject_to (ent->value, QDict), errp);if (!child) { goto error; }
@@ -940,7 +940,7 @@ QObject *qdict_crumple(const QDict *src, Error **errp) }qobject_incref (child); -qlist_append_obj (qobject_to_qlist (dst), child); +qlist_append_obj (qobject_to (dst, QList), child); }QDECREF (multi_level); multi_level =NULL ;
qobject/qjson.c +5 -5
@@ -133,14 +133,14 @@ static void to_json(const QObject *obj, QString *str, int pretty, int indent)qstring_append (str,"null" );break ;case QTYPE_QNUM : { -QNum *val =qobject_to_qnum (obj); +QNum *val =qobject_to (obj, QNum);char *buffer =qnum_to_string (val);qstring_append (str, buffer);g_free (buffer);break ; }case QTYPE_QSTRING : { -QString *val =qobject_to_qstring (obj); +QString *val =qobject_to (obj, QString);const char *ptr;int cp;char buf[16 ];
@@ -197,7 +197,7 @@ static void to_json(const QObject *obj, QString *str, int pretty, int indent) }case QTYPE_QDICT : {ToJsonIterState s; -QDict *val =qobject_to_qdict (obj); +QDict *val =qobject_to (obj, QDict); s.count =0 ; s.str = str;
@@ -216,7 +216,7 @@ static void to_json(const QObject *obj, QString *str, int pretty, int indent) }case QTYPE_QLIST : {ToJsonIterState s; -QList *val =qobject_to_qlist (obj); +QList *val =qobject_to (obj, QList); s.count =0 ; s.str = str;
@@ -234,7 +234,7 @@ static void to_json(const QObject *obj, QString *str, int pretty, int indent)break ; }case QTYPE_QBOOL : { -QBool *val =qobject_to_qbool (obj); +QBool *val =qobject_to (obj, QBool);if (qbool_get_bool (val)) {qstring_append (str,"true" );
qobject/qlist.c +3 -3
@@ -150,8 +150,8 @@ QList *qobject_to_qlist(const QObject *obj)*/ bool qlist_is_equal (const QObject *x,const QObject *y) { -const QList *list_x =qobject_to_qlist (x); -const QList *list_y =qobject_to_qlist (y); +const QList *list_x =qobject_to (x, QList); +const QList *list_y =qobject_to (y, QList);const QListEntry *entry_x, *entry_y; entry_x =qlist_first (list_x);
@@ -180,7 +180,7 @@ void qlist_destroy_obj(QObject *obj)QListEntry *entry, *next_entry;assert (obj !=NULL ); - qlist =qobject_to_qlist (obj); + qlist =qobject_to (obj, QList); QTAILQ_FOREACH_SAFE(entry, &qlist->head, next, next_entry) {QTAILQ_REMOVE (&qlist->head, entry, next);
qobject/qlit.c +5 -5
@@ -64,16 +64,16 @@ bool qlit_equal_qobject(const QLitObject *lhs, const QObject *rhs)switch (lhs->type) {case QTYPE_QBOOL : -return lhs->value.qbool ==qbool_get_bool (qobject_to_qbool (rhs)); +return lhs->value.qbool ==qbool_get_bool (qobject_to (rhs, QBool));case QTYPE_QNUM : -return lhs->value.qnum ==qnum_get_int (qobject_to_qnum (rhs)); +return lhs->value.qnum ==qnum_get_int (qobject_to (rhs, QNum));case QTYPE_QSTRING :return (strcmp (lhs->value.qstr, -qstring_get_str (qobject_to_qstring (rhs))) ==0 ); +qstring_get_str (qobject_to (rhs, QString))) ==0 );case QTYPE_QDICT : -return qlit_equal_qdict (lhs,qobject_to_qdict (rhs)); +return qlit_equal_qdict (lhs,qobject_to (rhs, QDict));case QTYPE_QLIST : -return qlit_equal_qlist (lhs,qobject_to_qlist (rhs)); +return qlit_equal_qlist (lhs,qobject_to (rhs, QList));case QTYPE_QNULL :return true;default :
qobject/qnum.c +3 -3
@@ -223,8 +223,8 @@ QNum *qobject_to_qnum(const QObject *obj)*/ bool qnum_is_equal (const QObject *x,const QObject *y) { -QNum *num_x =qobject_to_qnum (x); -QNum *num_y =qobject_to_qnum (y); +QNum *num_x =qobject_to (x, QNum); +QNum *num_y =qobject_to (y, QNum);switch (num_x->kind) {case QNUM_I64 :
@@ -273,5 +273,5 @@ bool qnum_is_equal(const QObject *x, const QObject *y)void qnum_destroy_obj (QObject *obj) {assert (obj !=NULL ); -g_free (qobject_to_qnum (obj)); +g_free (qobject_to (obj, QNum)); }
qobject/qstring.c +3 -3
@@ -133,8 +133,8 @@ const char *qstring_get_str(const QString *qstring)*/ bool qstring_is_equal (const QObject *x,const QObject *y) { -return !strcmp (qobject_to_qstring (x)->string, -qobject_to_qstring (y)->string); +return !strcmp (qobject_to (x, QString)->string, +qobject_to (y, QString)->string); }/**
@@ -146,7 +146,7 @@ void qstring_destroy_obj(QObject *obj)QString *qs;assert (obj !=NULL ); - qs =qobject_to_qstring (obj); + qs =qobject_to (obj, QString);g_free (qs->string);g_free (qs); }
qom/object.c +4 -4
@@ -1122,7 +1122,7 @@ char *object_property_get_str(Object *obj, const char *name,if (!ret) {return NULL ; } - qstring =qobject_to_qstring (ret); + qstring =qobject_to (ret, QString);if (!qstring) {error_setg (errp,QERR_INVALID_PARAMETER_TYPE , name,"string" ); retval =NULL ;
@@ -1183,7 +1183,7 @@ bool object_property_get_bool(Object *obj, const char *name,if (!ret) {return false; } - qbool =qobject_to_qbool (ret); + qbool =qobject_to (ret, QBool);if (!qbool) {error_setg (errp,QERR_INVALID_PARAMETER_TYPE , name,"boolean" ); retval = false;
@@ -1215,7 +1215,7 @@ int64_t object_property_get_int(Object *obj, const char *name,return -1 ; } - qnum =qobject_to_qnum (ret); + qnum =qobject_to (ret, QNum);if (!qnum || !qnum_get_try_int (qnum, &retval)) {error_setg (errp,QERR_INVALID_PARAMETER_TYPE , name,"int" ); retval =-1 ;
@@ -1244,7 +1244,7 @@ uint64_t object_property_get_uint(Object *obj, const char *name,if (!ret) {return 0 ; } - qnum =qobject_to_qnum (ret); + qnum =qobject_to (ret, QNum);if (!qnum || !qnum_get_try_uint (qnum, &retval)) {error_setg (errp,QERR_INVALID_PARAMETER_TYPE , name,"uint" ); retval =0 ;
target/i386/cpu.c +1 -1
@@ -3100,7 +3100,7 @@ arch_query_cpu_model_expansion(CpuModelExpansionType type, xc =x86_cpu_from_model (model->name, model->has_props ? -qobject_to_qdict (model->props) : +qobject_to (model->props, QDict) :NULL , &err);if (err) { goto out;
target/s390x/cpu_models.c +1 -1
@@ -452,7 +452,7 @@ static void cpu_model_from_info(S390CPUModel *model, const CpuModelInfo *info,Object *obj;if (info->props) { - qdict =qobject_to_qdict (info->props); + qdict =qobject_to (info->props, QDict);if (!qdict) {error_setg (errp,QERR_INVALID_PARAMETER_TYPE ,"props" ,"dict" );return ;
tests/check-qdict.c +10 -10
@@ -49,7 +49,7 @@ static void qdict_put_obj_test(void)g_assert (qdict_size (qdict) ==1 ); ent =QLIST_FIRST (&qdict->table[12345 %QDICT_BUCKET_MAX ]); - qn =qobject_to_qnum (ent->value); + qn =qobject_to (ent->value, QNum); g_assert_cmpint(qnum_get_int(qn), ==, num);QDECREF (qdict);
@@ -79,7 +79,7 @@ static void qdict_get_test(void) obj =qdict_get (tests_dict, key);g_assert (obj !=NULL ); - qn =qobject_to_qnum (obj); + qn =qobject_to (obj, QNum); g_assert_cmpint(qnum_get_int(qn), ==, value);QDECREF (tests_dict);
@@ -214,7 +214,7 @@ static void qdict_del_test(void)static void qobject_to_qdict_test (void ) {QDict *tests_dict =qdict_new (); -g_assert (qobject_to_qdict (QOBJECT (tests_dict)) == tests_dict); +g_assert (qobject_to (QOBJECT (tests_dict), QDict) == tests_dict);QDECREF (tests_dict); }
@@ -379,9 +379,9 @@ static void qdict_array_split_test(void)qdict_array_split (test_dict, &test_list); - dict1 =qobject_to_qdict (qlist_pop (test_list)); - dict2 =qobject_to_qdict (qlist_pop (test_list)); - int1 =qobject_to_qnum (qlist_pop (test_list)); + dict1 =qobject_to (qlist_pop (test_list), QDict); + dict2 =qobject_to (qlist_pop (test_list), QDict); + int1 =qobject_to (qlist_pop (test_list), QNum);g_assert (dict1);g_assert (dict2);
@@ -448,7 +448,7 @@ static void qdict_array_split_test(void)qdict_array_split (test_dict, &test_list); - int1 =qobject_to_qnum (qlist_pop (test_list)); + int1 =qobject_to (qlist_pop (test_list), QNum);g_assert (int1);g_assert (qlist_empty (test_list));
@@ -605,7 +605,7 @@ static void qdict_crumple_test_recursive(void)qdict_put_str (src,"vnc.acl..name" ,"acl0" );qdict_put_str (src,"vnc.acl.rule..name" ,"acl0" ); - dst =qobject_to_qdict (qdict_crumple (src, &error_abort)); + dst =qobject_to (qdict_crumple (src, &error_abort), QDict);g_assert (dst); g_assert_cmpint(qdict_size(dst), ==, 1);
@@ -627,14 +627,14 @@ static void qdict_crumple_test_recursive(void)g_assert (rules); g_assert_cmpint(qlist_size(rules), ==, 2); - rule =qobject_to_qdict (qlist_pop (rules)); + rule =qobject_to (qlist_pop (rules), QDict);g_assert (rule); g_assert_cmpint(qdict_size(rule), ==, 2); g_assert_cmpstr("fred", ==, qdict_get_str(rule, "match")); g_assert_cmpstr("allow", ==, qdict_get_str(rule, "policy"));QDECREF (rule); - rule =qobject_to_qdict (qlist_pop (rules)); + rule =qobject_to (qlist_pop (rules), QDict);g_assert (rule); g_assert_cmpint(qdict_size(rule), ==, 2); g_assert_cmpstr("bob", ==, qdict_get_str(rule, "match"));
tests/check-qjson.c +21 -20
144 lines not on this page · raw message
tests/check-qlist.c +2 -2
@@ -57,7 +57,7 @@ static void qobject_to_qlist_test(void) qlist =qlist_new (); -g_assert (qobject_to_qlist (QOBJECT (qlist)) == qlist); +g_assert (qobject_to (QOBJECT (qlist), QList) == qlist);QDECREF (qlist); }
@@ -72,7 +72,7 @@ static void iter_func(QObject *obj, void *opaque)g_assert (opaque ==NULL ); - qi =qobject_to_qnum (obj); + qi =qobject_to (obj, QNum);g_assert (qi !=NULL );g_assert (qnum_get_try_int (qi, &val));
tests/check-qlit.c +1 -1
@@ -58,7 +58,7 @@ static void qlit_equal_qobject_test(void)g_assert (!qlit_equal_qobject (&qlit_foo, qobj)); -qdict_put (qobject_to_qdict (qobj),"bee" ,qlist_new ()); +qdict_put (qobject_to (qobj, QDict),"bee" ,qlist_new ());g_assert (!qlit_equal_qobject (&qlit, qobj));qobject_decref (qobj);
tests/check-qnum.c +2 -2
@@ -127,11 +127,11 @@ static void qobject_to_qnum_test(void)QNum *qn; qn =qnum_from_int (0 ); -g_assert (qobject_to_qnum (QOBJECT (qn)) == qn); +g_assert (qobject_to (QOBJECT (qn), QNum) == qn);QDECREF (qn); qn =qnum_from_double (0 ); -g_assert (qobject_to_qnum (QOBJECT (qn)) == qn); +g_assert (qobject_to (QOBJECT (qn), QNum) == qn);QDECREF (qn); }
tests/check-qobject.c +1 -1
@@ -270,7 +270,7 @@ static void qobject_is_equal_dict_test(void) dict_different_null_key, dict_longer, dict_shorter, dict_nested); - dict_crumpled =qobject_to_qdict (qdict_crumple (dict_1, &local_err)); + dict_crumpled =qobject_to (qdict_crumple (dict_1, &local_err), QDict);g_assert (!local_err);check_equal (dict_crumpled, dict_nested);
tests/check-qstring.c +1 -1
@@ -79,7 +79,7 @@ static void qobject_to_qstring_test(void)QString *qstring; qstring =qstring_from_str ("foo" ); -g_assert (qobject_to_qstring (QOBJECT (qstring)) == qstring); +g_assert (qobject_to (QOBJECT (qstring), QString) == qstring);QDECREF (qstring); }
tests/device-introspect-test.c +7 -7
@@ -52,7 +52,7 @@ static QDict *qom_type_index(QList *types)QListEntry *e; QLIST_FOREACH_ENTRY(types, e) { -QDict *d =qobject_to_qdict (qlist_entry_obj (e)); +QDict *d =qobject_to (qlist_entry_obj (e), QDict);const char *name =qdict_get_str (d,"name" );QINCREF (d);qdict_put (index, name, d);
@@ -85,7 +85,7 @@ static QDict *type_list_find(QList *types, const char *name)QListEntry *e; QLIST_FOREACH_ENTRY(types, e) { -QDict *d =qobject_to_qdict (qlist_entry_obj (e)); +QDict *d =qobject_to (qlist_entry_obj (e), QDict);const char *ename =qdict_get_str (d,"name" );if (!strcmp (ename, name)) {return d;
@@ -151,7 +151,7 @@ static void test_qom_list_parents(const char *parent) index =qom_type_index (types); QLIST_FOREACH_ENTRY(types, e) { -QDict *d =qobject_to_qdict (qlist_entry_obj (e)); +QDict *d =qobject_to (qlist_entry_obj (e), QDict);const char *name =qdict_get_str (d,"name" );g_assert (qom_has_parent (index, name, parent));
@@ -173,7 +173,7 @@ static void test_qom_list_fields(void) non_abstract =qom_list_types (NULL , false); QLIST_FOREACH_ENTRY(all_types, e) { -QDict *d =qobject_to_qdict (qlist_entry_obj (e)); +QDict *d =qobject_to (qlist_entry_obj (e), QDict);const char *name =qdict_get_str (d,"name" );bool abstract =qdict_haskey (d,"abstract" ) ? qdict_get_bool(d, "abstract") :
@@ -216,8 +216,8 @@ static void test_device_intro_concrete(void) types =device_type_list (false); QLIST_FOREACH_ENTRY(types, entry) { - type =qdict_get_try_str (qobject_to_qdict (qlist_entry_obj (entry)), -"name" ); + type =qdict_get_try_str (qobject_to (qlist_entry_obj (entry), QDict), +"name" );g_assert (type);test_one_device (type); }
@@ -238,7 +238,7 @@ static void test_abstract_interfaces(void) index =qom_type_index (all_types); QLIST_FOREACH_ENTRY(all_types, e) { -QDict *d =qobject_to_qdict (qlist_entry_obj (e)); +QDict *d =qobject_to (qlist_entry_obj (e), QDict);const char *name =qdict_get_str (d,"name" );/*
tests/libqtest.c +3 -3
@@ -424,7 +424,7 @@ static void qmp_response(JSONMessageParser *parser, GQueue *tokens) }g_assert (!qmp->response); - qmp->response =qobject_to_qdict (obj); + qmp->response =qobject_to (obj, QDict);g_assert (qmp->response); }
@@ -998,11 +998,11 @@ void qtest_cb_for_every_machine(void (*cb)(const char *machine))g_assert (list);for (p =qlist_first (list); p; p =qlist_next (p)) { - minfo =qobject_to_qdict (qlist_entry_obj (p)); + minfo =qobject_to (qlist_entry_obj (p), QDict);g_assert (minfo); qobj =qdict_get (minfo,"name" );g_assert (qobj); - qstr =qobject_to_qstring (qobj); + qstr =qobject_to (qobj, QString);g_assert (qstr); mname =qstring_get_str (qstr);cb (mname);
tests/numa-test.c +4 -4
@@ -96,7 +96,7 @@ static void test_query_cpus(const void *data)QDict *cpu, *props;int64_t cpu_idx, node; - cpu =qobject_to_qdict (e); + cpu =qobject_to (e, QDict);g_assert (qdict_haskey (cpu,"CPU" ));g_assert (qdict_haskey (cpu,"props" ));
@@ -138,7 +138,7 @@ static void pc_numa_cpu(const void *data)QDict *cpu, *props;int64_t socket, core, thread, node; - cpu =qobject_to_qdict (e); + cpu =qobject_to (e, QDict);g_assert (qdict_haskey (cpu,"props" )); props =qdict_get_qdict (cpu,"props" );
@@ -191,7 +191,7 @@ static void spapr_numa_cpu(const void *data)QDict *cpu, *props;int64_t core, node; - cpu =qobject_to_qdict (e); + cpu =qobject_to (e, QDict);g_assert (qdict_haskey (cpu,"props" )); props =qdict_get_qdict (cpu,"props" );
@@ -234,7 +234,7 @@ static void aarch64_numa_cpu(const void *data)QDict *cpu, *props;int64_t thread, node; - cpu =qobject_to_qdict (e); + cpu =qobject_to (e, QDict);g_assert (qdict_haskey (cpu,"props" )); props =qdict_get_qdict (cpu,"props" );
tests/qom-test.c +2 -2
@@ -61,9 +61,9 @@ static void test_properties(const char *path, bool recurse) }g_assert (qdict_haskey (response,"return" )); - list =qobject_to_qlist (qdict_get (response,"return" )); + list =qobject_to (qdict_get (response,"return" ), QList); QLIST_FOREACH_ENTRY(list, entry) { - tuple =qobject_to_qdict (qlist_entry_obj (entry)); + tuple =qobject_to (qlist_entry_obj (entry), QDict);bool is_child =strstart (qdict_get_str (tuple,"type" ),"child<" ,NULL );bool is_link =strstart (qdict_get_str (tuple,"type" ),"link<" ,NULL );
tests/test-char.c +1 -1
@@ -320,7 +320,7 @@ static void char_socket_test(void)g_assert (!object_property_get_bool (OBJECT (chr),"connected" , &error_abort)); addr =object_property_get_qobject (OBJECT (chr),"addr" , &error_abort); - qdict =qobject_to_qdict (addr); + qdict =qobject_to (addr, QDict); port =qdict_get_str (qdict,"port" ); tmp =g_strdup_printf ("tcp:127.0.0.1:%s" , port);QDECREF (qdict);
tests/test-keyval.c +4 -4
@@ -193,7 +193,7 @@ static void check_list012(QList *qlist)g_assert (qlist);for (i =0 ; i <ARRAY_SIZE (expected); i++) { - qstr =qobject_to_qstring (qlist_pop (qlist)); + qstr =qobject_to (qlist_pop (qlist), QString);g_assert (qstr); g_assert_cmpstr(qstring_get_str(qstr), ==, expected[i]);QDECREF (qstr);
@@ -652,12 +652,12 @@ static void test_keyval_visit_any(void)QDECREF (qdict);visit_start_struct (v,NULL ,NULL ,0 , &error_abort);visit_type_any (v,"a" , &any, &error_abort); - qlist =qobject_to_qlist (any); + qlist =qobject_to (any, QList);g_assert (qlist); - qstr =qobject_to_qstring (qlist_pop (qlist)); + qstr =qobject_to (qlist_pop (qlist), QString); g_assert_cmpstr(qstring_get_str(qstr), ==, "null");QDECREF (qstr); - qstr =qobject_to_qstring (qlist_pop (qlist)); + qstr =qobject_to (qlist_pop (qlist), QString); g_assert_cmpstr(qstring_get_str(qstr), ==, "1");g_assert (qlist_empty (qlist));QDECREF (qstr);
tests/test-qga.c +10 -9
@@ -295,8 +295,8 @@ static void test_qga_get_vcpus(gconstpointer fix)/* check there is at least a cpu */ list =qdict_get_qlist (ret,"return" ); entry =qlist_first (list); -g_assert (qdict_haskey (qobject_to_qdict (entry->value),"online" )); -g_assert (qdict_haskey (qobject_to_qdict (entry->value),"logical-id" )); +g_assert (qdict_haskey (qobject_to (entry->value, QDict),"online" )); +g_assert (qdict_haskey (qobject_to (entry->value, QDict),"logical-id" ));QDECREF (ret); }
@@ -316,10 +316,10 @@ static void test_qga_get_fsinfo(gconstpointer fix) list =qdict_get_qlist (ret,"return" ); entry =qlist_first (list);if (entry) { -g_assert (qdict_haskey (qobject_to_qdict (entry->value),"name" )); -g_assert (qdict_haskey (qobject_to_qdict (entry->value),"mountpoint" )); -g_assert (qdict_haskey (qobject_to_qdict (entry->value),"type" )); -g_assert (qdict_haskey (qobject_to_qdict (entry->value),"disk" )); +g_assert (qdict_haskey (qobject_to (entry->value, QDict),"name" )); +g_assert (qdict_haskey (qobject_to (entry->value, QDict),"mountpoint" )); +g_assert (qdict_haskey (qobject_to (entry->value, QDict),"type" )); +g_assert (qdict_haskey (qobject_to (entry->value, QDict),"disk" )); }QDECREF (ret);
@@ -361,8 +361,9 @@ static void test_qga_get_memory_blocks(gconstpointer fix) entry =qlist_first (list);/* newer versions of qga may return empty list without error */ if (entry) { -g_assert (qdict_haskey (qobject_to_qdict (entry->value),"phys-index" )); -g_assert (qdict_haskey (qobject_to_qdict (entry->value),"online" )); +g_assert (qdict_haskey (qobject_to (entry->value, QDict), +"phys-index" )); +g_assert (qdict_haskey (qobject_to (entry->value, QDict),"online" )); } }
@@ -383,7 +384,7 @@ static void test_qga_network_get_interfaces(gconstpointer fix)/* check there is at least an interface */ list =qdict_get_qlist (ret,"return" ); entry =qlist_first (list); -g_assert (qdict_haskey (qobject_to_qdict (entry->value),"name" )); +g_assert (qdict_haskey (qobject_to (entry->value, QDict),"name" ));QDECREF (ret); }
tests/test-qmp-commands.c +6 -6
@@ -98,7 +98,7 @@ static void test_dispatch_cmd(void) resp =qmp_dispatch (&qmp_commands,QOBJECT (req));assert (resp !=NULL ); -assert (!qdict_haskey (qobject_to_qdict (resp),"error" )); +assert (!qdict_haskey (qobject_to (resp, QDict),"error" ));qobject_decref (resp);QDECREF (req);
@@ -115,7 +115,7 @@ static void test_dispatch_cmd_failure(void) resp =qmp_dispatch (&qmp_commands,QOBJECT (req));assert (resp !=NULL ); -assert (qdict_haskey (qobject_to_qdict (resp),"error" )); +assert (qdict_haskey (qobject_to (resp, QDict),"error" ));qobject_decref (resp);QDECREF (req);
@@ -129,7 +129,7 @@ static void test_dispatch_cmd_failure(void) resp =qmp_dispatch (&qmp_commands,QOBJECT (req));assert (resp !=NULL ); -assert (qdict_haskey (qobject_to_qdict (resp),"error" )); +assert (qdict_haskey (qobject_to (resp, QDict),"error" ));qobject_decref (resp);QDECREF (req);
@@ -143,7 +143,7 @@ static QObject *test_qmp_dispatch(QDict *req) resp_obj =qmp_dispatch (&qmp_commands,QOBJECT (req));assert (resp_obj); - resp =qobject_to_qdict (resp_obj); + resp =qobject_to (resp_obj, QDict);assert (resp && !qdict_haskey (resp,"error" )); ret =qdict_get (resp,"return" );assert (ret);
@@ -174,7 +174,7 @@ static void test_dispatch_cmd_io(void)qdict_put (req,"arguments" , args);qdict_put_str (req,"execute" ,"user_def_cmd2" ); - ret =qobject_to_qdict (test_qmp_dispatch (req)); + ret =qobject_to (test_qmp_dispatch (req), QDict);assert (!strcmp (qdict_get_str (ret,"string0" ),"blah1" )); ret_dict =qdict_get_qdict (ret,"dict1" );
@@ -195,7 +195,7 @@ static void test_dispatch_cmd_io(void)qdict_put (req,"arguments" , args3);qdict_put_str (req,"execute" ,"guest-get-time" ); - ret3 =qobject_to_qnum (test_qmp_dispatch (req)); + ret3 =qobject_to (test_qmp_dispatch (req), QNum);g_assert (qnum_get_try_int (ret3, &val)); g_assert_cmpint(val, ==, 66);QDECREF (ret3);
tests/test-qmp-event.c +8 -8
@@ -59,22 +59,22 @@ void qdict_cmp_do_simple(const char *key, QObject *obj1, void *opaque)switch (qobject_type (obj1)) {case QTYPE_QBOOL : - d->result = (qbool_get_bool (qobject_to_qbool (obj1)) == -qbool_get_bool (qobject_to_qbool (obj2))); + d->result = (qbool_get_bool (qobject_to (obj1, QBool)) == +qbool_get_bool (qobject_to (obj2, QBool)));return ;case QTYPE_QNUM : -g_assert (qnum_get_try_int (qobject_to_qnum (obj1), &val1)); -g_assert (qnum_get_try_int (qobject_to_qnum (obj2), &val2)); +g_assert (qnum_get_try_int (qobject_to (obj1, QNum), &val1)); +g_assert (qnum_get_try_int (qobject_to (obj2, QNum), &val2)); d->result = val1 == val2;return ;case QTYPE_QSTRING : - d->result =g_strcmp0 (qstring_get_str (qobject_to_qstring (obj1)), -qstring_get_str (qobject_to_qstring (obj2))) ==0 ; + d->result =g_strcmp0 (qstring_get_str (qobject_to (obj1, QString)), +qstring_get_str (qobject_to (obj2, QString))) ==0 ;return ;case QTYPE_QDICT : - d_new.expect =qobject_to_qdict (obj2); + d_new.expect =qobject_to (obj2, QDict); d_new.result = true; -qdict_iter (qobject_to_qdict (obj1), qdict_cmp_do_simple, &d_new); +qdict_iter (qobject_to (obj1, QDict), qdict_cmp_do_simple, &d_new); d->result = d_new.result;return ;default :
tests/test-qobject-input-visitor.c +5 -5
@@ -476,7 +476,7 @@ static void test_visitor_in_any(TestInputVisitorData *data, v =visitor_input_test_init (data,"-42" );visit_type_any (v,NULL , &res, &error_abort); - qnum =qobject_to_qnum (res); + qnum =qobject_to (res, QNum);g_assert (qnum);g_assert (qnum_get_try_int (qnum, &val)); g_assert_cmpint(val, ==, -42);
@@ -484,22 +484,22 @@ static void test_visitor_in_any(TestInputVisitorData *data, v =visitor_input_test_init (data,"{ 'integer': -42, 'boolean': true, 'string': 'foo' }" );visit_type_any (v,NULL , &res, &error_abort); - qdict =qobject_to_qdict (res); + qdict =qobject_to (res, QDict);g_assert (qdict &&qdict_size (qdict) ==3 ); qobj =qdict_get (qdict,"integer" );g_assert (qobj); - qnum =qobject_to_qnum (qobj); + qnum =qobject_to (qobj, QNum);g_assert (qnum);g_assert (qnum_get_try_int (qnum, &val)); g_assert_cmpint(val, ==, -42); qobj =qdict_get (qdict,"boolean" );g_assert (qobj); - qbool =qobject_to_qbool (qobj); + qbool =qobject_to (qobj, QBool);g_assert (qbool);g_assert (qbool_get_bool (qbool) == true); qobj =qdict_get (qdict,"string" );g_assert (qobj); - qstring =qobject_to_qstring (qobj); + qstring =qobject_to (qobj, QString);g_assert (qstring); g_assert_cmpstr(qstring_get_str(qstring), ==, "foo");qobject_decref (res);
tests/test-qobject-output-visitor.c +27 -27
200 lines not on this page · raw message
tests/test-x86-cpuid-compat.c +9 -8
@@ -17,7 +17,7 @@ static char *get_cpu0_qom_path(void)g_assert (qdict_haskey (resp,"return" )); ret =qdict_get_qlist (resp,"return" ); - cpu0 =qobject_to_qdict (qlist_peek (ret)); + cpu0 =qobject_to (qlist_peek (ret), QDict); path =g_strdup (qdict_get_str (cpu0,"qom_path" ));QDECREF (resp);return path;
@@ -38,7 +38,7 @@ static QObject *qom_get(const char *path, const char *prop)#ifdef CONFIG_HAS_GLIB_SUBPROCESS_TESTS static bool qom_get_bool (const char *path,const char *prop) { -QBool *value =qobject_to_qbool (qom_get (path, prop)); +QBool *value =qobject_to (qom_get (path, prop), QBool);bool b =qbool_get_bool (value);QDECREF (value);
@@ -61,7 +61,7 @@ static void test_cpuid_prop(const void *data)qtest_start (args->cmdline); path =get_cpu0_qom_path (); - value =qobject_to_qnum (qom_get (path, args->property)); + value =qobject_to (qom_get (path, args->property), QNum);g_assert (qnum_get_try_int (value, &val)); g_assert_cmpint(val, ==, args->expected_value);qtest_end ();
@@ -105,7 +105,7 @@ static uint32_t get_feature_word(QList *features, uint32_t eax, uint32_t ecx,const QListEntry *e;for (e =qlist_first (features); e; e =qlist_next (e)) { -QDict *w =qobject_to_qdict (qlist_entry_obj (e)); +QDict *w =qobject_to (qlist_entry_obj (e), QDict);const char *rreg =qdict_get_str (w,"cpuid-register" );uint32_t reax =qdict_get_int (w,"cpuid-input-eax" );bool has_ecx =qdict_haskey (w,"cpuid-input-ecx" );
@@ -116,8 +116,9 @@ static uint32_t get_feature_word(QList *features, uint32_t eax, uint32_t ecx, recx =qdict_get_int (w,"cpuid-input-ecx" ); }if (eax == reax && (!has_ecx || ecx == recx) && !strcmp (rreg, reg)) { -g_assert (qnum_get_try_int (qobject_to_qnum (qdict_get (w,"features" )), - &val)); +g_assert (qnum_get_try_int (qobject_to (qdict_get (w,"features" ), + QNum), + &val));return val; } }
@@ -133,8 +134,8 @@ static void test_feature_flag(const void *data)qtest_start (args->cmdline); path =get_cpu0_qom_path (); - present =qobject_to_qlist (qom_get (path,"feature-words" )); - filtered =qobject_to_qlist (qom_get (path,"filtered-features" )); + present =qobject_to (qom_get (path,"feature-words" ), QList); + filtered =qobject_to (qom_get (path,"filtered-features" ), QList); value =get_feature_word (present, args->in_eax, args->in_ecx, args->reg); value |=get_feature_word (filtered, args->in_eax, args->in_ecx, args->reg);qtest_end ();
util/keyval.c +2 -2
@@ -219,7 +219,7 @@ static const char *keyval_parse_one(QDict *qdict, const char *params,if (!next) {return NULL ; } - cur =qobject_to_qdict (next); + cur =qobject_to (next, QDict);assert (cur); }
@@ -312,7 +312,7 @@ static QObject *keyval_listify(QDict *cur, GSList *key_of_cur, Error **errp) has_member = true; } - qdict =qobject_to_qdict (ent->value); + qdict =qobject_to (ent->value, QDict);if (!qdict) {continue ; }
util/qemu-config.c +1 -1
@@ -525,7 +525,7 @@ static void config_parse_qdict_section(QDict *options, QemuOptsList *opts, } QLIST_FOREACH_ENTRY(list, list_entry) { -QDict *section =qobject_to_qdict (qlist_entry_obj (list_entry)); +QDict *section =qobject_to (qlist_entry_obj (list_entry), QDict);char *opt_name;if (!section) {
util/qemu-option.c +3 -3
@@ -916,15 +916,15 @@ static void qemu_opts_from_qdict_1(const char *key, QObject *obj, void *opaque)switch (qobject_type (obj)) {case QTYPE_QSTRING : - value =qstring_get_str (qobject_to_qstring (obj)); + value =qstring_get_str (qobject_to (obj, QString));break ;case QTYPE_QNUM : - tmp =qnum_to_string (qobject_to_qnum (obj)); + tmp =qnum_to_string (qobject_to (obj, QNum)); value = tmp;break ;case QTYPE_QBOOL :pstrcpy (buf,sizeof (buf), -qbool_get_bool (qobject_to_qbool (obj)) ?"on" :"off" ); +qbool_get_bool (qobject_to (obj, QBool)) ?"on" :"off" ); value = buf;break ;default :
Signature · 1 line
2.14.3
Re: [Qemu-devel] [PATCH v2 2/6] qapi: Replace qobject_to_X(o) by qobject_to(o, X)
Quoted 22 lines · Max Reitz
This patch was generated using the following Coccinelle script:
@@
expression Obj;
@@
(
-qobject_to_qnum(Obj)
+qobject_to(Obj, QNum)
|
-qobject_to_qstring(Obj)
+qobject_to(Obj, QString)
|
-qobject_to_qdict(Obj)
+qobject_to(Obj, QDict)
|
-qobject_to_qlist(Obj)
+qobject_to(Obj, QList)
|
-qobject_to_qbool(Obj)
+qobject_to(Obj, QBool)
)
Quoted 4 lines
and a bit of manual fix-up for overly long lines and three places in
tests/check-qjson.cthat Coccinelle did not find.Signed-off-by Max Reitz <[email protected]>
Berto
Re: [Qemu-devel] [PATCH v2 2/6] qapi: Replace qobject_to_X(o) by qobject_to(o, X)
In reply to Max ReitzQuoted 13 lines · Max Reitz
This patch was generated using the following Coccinelle script:
@@
expression Obj;
@@
(
-qobject_to_qnum(Obj)
+qobject_to(Obj, QNum)
|
-qobject_to_qstring(Obj)
+qobject_to(Obj, QString)
|
-qobject_to_qdict(Obj)
Quoted 8 lines
+
qobject_to(Obj, QDict)
|
-qobject_to_qlist(Obj)
+qobject_to(Obj, QList)
|
-qobject_to_qbool(Obj)
+qobject_to(Obj, QBool)
)
Worth adding these to scripts/coccinelle/qobject.cocci?
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [Qemu-devel] [PATCH v2 2/6] qapi: Replace qobject_to_X(o) by qobject_to(o, X)
Quoted 23 lines · Eric Blake
Quoted 13 lines · Max Reitz
This patch was generated using the following Coccinelle script:
@@
expression Obj;
@@
(
-qobject_to_qnum(Obj)
+qobject_to(Obj, QNum)
|
-qobject_to_qstring(Obj)
+qobject_to(Obj, QString)
|
-qobject_to_qdict(Obj)Quoted 8 lines
+
qobject_to(Obj, QDict)
|
-qobject_to_qlist(Obj)
+qobject_to(Obj, QList)
|
-qobject_to_qbool(Obj)
+qobject_to(Obj, QBool)
)
Quoted 1 line
Worth adding these to
scripts/coccinelle/qobject.cocci?
Answering myself - perhaps not, since 3/6 deletes the functions meaning they won't reappear as something we need to keep checking for.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
PATCH v2 3/6 qapi: Remove qobject_to_X() functions
In reply to Max ReitzThey are no longer needed now.
--- include/qapi/qmp/qbool.h | 1 - include/qapi/qmp/qdict.h | 1 - include/qapi/qmp/qlist.h | 1 - include/qapi/qmp/qnum.h | 1 - include/qapi/qmp/qstring.h | 1 - qobject/qbool.c | 11 ----------- qobject/qdict.c | 11 ----------- qobject/qlist.c | 11 ----------- qobject/qnum.c | 11 ----------- qobject/qstring.c | 11 ----------- 10 files changed, 60 deletions(-)
include/qapi/qmp/qbool.h +0 -1
@@ -23,7 +23,6 @@ typedef struct QBool {QBool *qbool_from_bool (bool value);bool qbool_get_bool (const QBool *qb); -QBool *qobject_to_qbool (const QObject *obj);bool qbool_is_equal (const QObject *x,const QObject *y);void qbool_destroy_obj (QObject *obj);
include/qapi/qmp/qdict.h +0 -1
@@ -42,7 +42,6 @@ void qdict_put_obj(QDict *qdict, const char *key, QObject *value);void qdict_del (QDict *qdict,const char *key);int qdict_haskey (const QDict *qdict,const char *key);QObject *qdict_get (const QDict *qdict,const char *key); -QDict *qobject_to_qdict (const QObject *obj);bool qdict_is_equal (const QObject *x,const QObject *y); void qdict_iter(const QDict *qdict, void (*iter)(const char *key, QObject *obj, void *opaque),
include/qapi/qmp/qlist.h +0 -1
@@ -60,7 +60,6 @@ QObject *qlist_pop(QList *qlist);QObject *qlist_peek (QList *qlist);int qlist_empty (const QList *qlist);size_t qlist_size (const QList *qlist); -QList *qobject_to_qlist (const QObject *obj);bool qlist_is_equal (const QObject *x,const QObject *y);void qlist_destroy_obj (QObject *obj);
include/qapi/qmp/qnum.h +0 -1
@@ -68,7 +68,6 @@ double qnum_get_double(QNum *qn);char *qnum_to_string (QNum *qn); -QNum *qobject_to_qnum (const QObject *obj);bool qnum_is_equal (const QObject *x,const QObject *y);void qnum_destroy_obj (QObject *obj);
include/qapi/qmp/qstring.h +0 -1
@@ -30,7 +30,6 @@ const char *qstring_get_str(const QString *qstring);void qstring_append_int (QString *qstring,int64_t value);void qstring_append (QString *qstring,const char *str);void qstring_append_chr (QString *qstring,int c); -QString *qobject_to_qstring (const QObject *obj);bool qstring_is_equal (const QObject *x,const QObject *y);void qstring_destroy_obj (QObject *obj);
qobject/qbool.c +0 -11
@@ -40,17 +40,6 @@ bool qbool_get_bool(const QBool *qb)return qb->value; } -/** -* qobject_to_qbool(): Convert a QObject into a QBool -*/ -QBool *qobject_to_qbool (const QObject *obj) -{ -if (!obj ||qobject_type (obj) !=QTYPE_QBOOL ) { -return NULL ; - } -return container_of (obj, QBool, base); -} -/** * qbool_is_equal(): Test whether the two QBools are equal */
qobject/qdict.c +0 -11
@@ -36,17 +36,6 @@ QDict *qdict_new(void)return qdict; } -/** -* qobject_to_qdict(): Convert a QObject into a QDict -*/ -QDict *qobject_to_qdict (const QObject *obj) -{ -if (!obj ||qobject_type (obj) !=QTYPE_QDICT ) { -return NULL ; - } -return container_of (obj, QDict, base); -} -/** * tdb_hash(): based on the hash agorithm from gdbm, via tdb * (from module-init-tools)
qobject/qlist.c +0 -11
@@ -128,17 +128,6 @@ size_t qlist_size(const QList *qlist)return count; } -/** -* qobject_to_qlist(): Convert a QObject into a QList -*/ -QList *qobject_to_qlist (const QObject *obj) -{ -if (!obj ||qobject_type (obj) !=QTYPE_QLIST ) { -return NULL ; - } -return container_of (obj, QList, base); -} -/** * qlist_is_equal(): Test whether the two QLists are equal *
qobject/qnum.c +0 -11
@@ -201,17 +201,6 @@ char *qnum_to_string(QNum *qn)return NULL ; } -/** -* qobject_to_qnum(): Convert a QObject into a QNum -*/ -QNum *qobject_to_qnum (const QObject *obj) -{ -if (!obj ||qobject_type (obj) !=QTYPE_QNUM ) { -return NULL ; - } -return container_of (obj, QNum, base); -} -/** * qnum_is_equal(): Test whether the two QNums are equal *
qobject/qstring.c +0 -11
@@ -106,17 +106,6 @@ void qstring_append_chr(QString *qstring, int c) qstring->string[qstring->length] =0 ; } -/** -* qobject_to_qstring(): Convert a QObject to a QString -*/ -QString *qobject_to_qstring (const QObject *obj) -{ -if (!obj ||qobject_type (obj) !=QTYPE_QSTRING ) { -return NULL ; - } -return container_of (obj, QString, base); -} -/** * qstring_get_str(): Return a pointer to the stored string *
Signature · 1 line
2.14.3
Re: [Qemu-devel] [PATCH v2 3/6] qapi: Remove qobject_to_X() functions
Quoted 3 lines · Max Reitz
They are no longer needed now.
Signed-off-by Max Reitz <[email protected]>
Berto
PATCH v2 4/6 qapi: Make more of qobject_to()
In reply to Max ReitzThis patch reworks some places which use either qobject_type() checks plus qobject_to(), where the latter alone is sufficient, or NULL checks plus qobject_type() checks where we can simply do a qobject_to() != NULL check.
--- qapi/qobject-input-visitor.c | 4 ++-- qobject/json-parser.c | 13 +++++++------ qobject/qdict.c | 20 +++++++++++--------- 3 files changed, 20 insertions(+), 17 deletions(-)
qapi/qobject-input-visitor.c +2 -2
@@ -334,7 +334,7 @@ static GenericList *qobject_input_next_list(Visitor *v, GenericList *tail,QObjectInputVisitor *qiv =to_qiv (v);StackObject *tos =QSLIST_FIRST (&qiv->stack); -assert (tos && tos->obj &&qobject_type (tos->obj) ==QTYPE_QLIST ); +assert (tos &&qobject_to (tos->obj, QList));if (!tos->entry) {return NULL ;
@@ -348,7 +348,7 @@ static void qobject_input_check_list(Visitor *v, Error **errp)QObjectInputVisitor *qiv =to_qiv (v);StackObject *tos =QSLIST_FIRST (&qiv->stack); -assert (tos && tos->obj &&qobject_type (tos->obj) ==QTYPE_QLIST ); +assert (tos &&qobject_to (tos->obj, QList));if (tos->entry) { error_setg(errp, "Only %u list elements expected in %s",
qobject/json-parser.c +7 -6
@@ -271,7 +271,8 @@ static void parser_context_free(JSONParserContext *ctxt)*/ static int parse_pair (JSONParserContext *ctxt,QDict *dict,va_list *ap) { -QObject *key =NULL , *value; +QObject *value; +QString *key =NULL ;JSONToken *peek, *token; peek =parser_context_peek_token (ctxt);
@@ -280,8 +281,8 @@ static int parse_pair(JSONParserContext *ctxt, QDict *dict, va_list *ap) goto out; } - key =parse_value (ctxt, ap); -if (!key ||qobject_type (key) !=QTYPE_QSTRING ) { + key =qobject_to (parse_value (ctxt, ap), QString); +if (!key) {parse_error (ctxt, peek,"key is not a string in object" ); goto out; }
@@ -303,14 +304,14 @@ static int parse_pair(JSONParserContext *ctxt, QDict *dict, va_list *ap) goto out; } -qdict_put_obj (dict,qstring_get_str (qobject_to (key, QString)), value); +qdict_put_obj (dict,qstring_get_str (key), value); -qobject_decref (key); +QDECREF (key);return 0 ; out: -qobject_decref (key); +QDECREF (key);return -1 ; }
qobject/qdict.c +11 -9
@@ -861,18 +861,20 @@ QObject *qdict_crumple(const QDict *src, Error **errp) child =qdict_get (two_level, prefix);if (suffix) { -if (child) { -if (qobject_type (child) !=QTYPE_QDICT ) { +QDict *child_dict =qobject_to (child, QDict); +if (!child_dict) { +if (child) {error_setg (errp,"Key %s prefix is already set as a scalar" , prefix); goto error; } - }else { - child =QOBJECT (qdict_new ()); -qdict_put_obj (two_level, prefix, child); + + child_dict =qdict_new (); +qdict_put_obj (two_level, prefix,QOBJECT (child_dict)); } +qobject_incref (ent->value); -qdict_put_obj (qobject_to (child, QDict), suffix, ent->value); +qdict_put_obj (child_dict, suffix, ent->value); }else {if (child) { error_setg(errp, "Key %s prefix is already set as a dict",
@@ -892,9 +894,9 @@ QObject *qdict_crumple(const QDict *src, Error **errp) multi_level =qdict_new ();for (ent =qdict_first (two_level); ent !=NULL ; ent =qdict_next (two_level, ent)) { - -if (qobject_type (ent->value) ==QTYPE_QDICT ) { - child =qdict_crumple (qobject_to (ent->value, QDict), errp); +QDict *dict =qobject_to (ent->value, QDict); +if (dict) { + child =qdict_crumple (dict, errp);if (!child) { goto error; }
Signature · 1 line
2.14.3
Re: [Qemu-devel] [PATCH v2 4/6] qapi: Make more of qobject_to()
Quoted 6 lines · Max Reitz
This patch reworks some places which use either
qobject_type()checks plusqobject_to(), where the latter alone is sufficient, or NULL checks plusqobject_type()checks where we can simply do aqobject_to()!= NULL check.Signed-off-by Max Reitz <[email protected]>
Berto
PATCH v2 5/6 block: Handle null backing link
In reply to Max ReitzInstead of converting all "backing": null instances into "backing": "", handle a null value directly in bdrv_open_inherit().
This enables explicitly null backing links for json:{} filenames.
--- block.c | 4 +++- blockdev.c | 14 -------------- tests/qemu-iotests/089 | 20 ++++++++++++++++++++ tests/qemu-iotests/089.out | 8 ++++++++ 4 files changed, 31 insertions(+), 15 deletions(-)
block.c +3 -1
@@ -2597,7 +2597,9 @@ static BlockDriverState *bdrv_open_inherit(const char *filename,/* See cautionary note on accessing @options above */ backing =qdict_get_try_str (options,"backing" ); -if (backing && *backing =='\0' ) { +if (qobject_to (qdict_get (options,"backing" ), QNull) !=NULL || + (backing && *backing =='\0' )) + { flags |=BDRV_O_NO_BACKING ;qdict_del (options,"backing" ); }
blockdev.c +0 -14
@@ -3969,7 +3969,6 @@ void qmp_blockdev_add(BlockdevOptions *options, Error **errp)QObject *obj;Visitor *v =qobject_output_visitor_new (&obj);QDict *qdict; -const QDictEntry *ent;Error *local_err =NULL ;visit_type_BlockdevOptions (v,NULL , &options, &local_err);
@@ -3983,19 +3982,6 @@ void qmp_blockdev_add(BlockdevOptions *options, Error **errp)qdict_flatten (qdict); -/* -* Rewrite "backing": null to "backing": "" -* TODO Rewrite "" to null instead, and perhaps not even here -*/ -for (ent =qdict_first (qdict); ent; ent =qdict_next (qdict, ent)) { -char *dot =strrchr (ent->key,'.' ); - -if (!strcmp (dot ? dot +1 : ent->key,"backing" ) - &&qobject_type (ent->value) ==QTYPE_QNULL ) { -qdict_put (qdict, ent->key,qstring_new ()); - } - } -if (!qdict_get_try_str (qdict,"node-name" )) {error_setg (errp,"'node-name' must be specified for the root node" ); goto fail;
tests/qemu-iotests/089 +20 -0
@@ -82,6 +82,26 @@ $QEMU_IO_PROG --cache $CACHEMODE \ $QEMU_IO -c 'read -P 42 0 512' "$TEST_IMG" | _filter_qemu_io +echo +echo "=== Testing correct handling of 'backing':null ===" +echo + +_make_test_img -b "$TEST_IMG.base" $IMG_SIZE + +# This should read 42 +$QEMU_IO -c 'read -P 42 0 512' "$TEST_IMG" | _filter_qemu_io + +# This should read 0 +$QEMU_IO -c 'read -P 0 0 512' "json:{\ + 'driver': '$IMGFMT', + 'file': { + 'driver': 'file', + 'filename': '$TEST_IMG' + }, + 'backing': null +}" | _filter_qemu_io + + # Taken from test 071 echo echo "=== Testing blkdebug ==="
tests/qemu-iotests/089.out +8 -0
@@ -19,6 +19,14 @@ Pattern verification failed at offset 0, 512 bytes read 512/512 bytes at offset 0 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +=== Testing correct handling of 'backing':null === + +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.base +read 512/512 bytes at offset 0 +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 512/512 bytes at offset 0 +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + === Testing blkdebug === Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
Signature · 1 line
2.14.3
Quoted 6 lines · Max Reitz
Instead of converting all "backing": null instances into "backing": "", handle a null value directly in
bdrv_open_inherit().This enables explicitly null backing links for json:{} filenames.
Signed-off-by Max Reitz <[email protected]>
Berto
PATCH v2 6/6 block: Deprecate "backing": ""
In reply to Max ReitzWe have a clear replacement, so let's deprecate it.
--- qapi/block-core.json | 4 ++-- block.c | 4 ++++ qemu-doc.texi | 7 +++++++ qemu-options.hx | 4 ++-- 4 files changed, 15 insertions(+), 4 deletions(-)
qapi/block-core.json +2 -2
@@ -1090,7 +1090,7 @@ # @overlay: reference to the existing block device that will become # the overlay of @node, as part of creating the snapshot. # It must not have a current backing file (this can be -# achieved by passing "backing": "" to blockdev-add). +# achieved by passing "backing": null to blockdev-add). # # Since: 2.5 ##
@@ -1238,7 +1238,7 @@ # "node-name": "node1534", # "file": { "driver": "file", # "filename": "hd1.qcow2" }, -# "backing": "" } } +# "backing": null } } # # <- { "return": {} } #
block.c +4 -0
@@ -2600,6 +2600,10 @@ static BlockDriverState *bdrv_open_inherit(const char *filename,if (qobject_to (qdict_get (options,"backing" ), QNull) !=NULL || (backing && *backing =='\0' )) { +if (backing) { +warn_report ("Use of \"backing\": \"\" is deprecated; " +"use \"backing\": null instead" ); + } flags |=BDRV_O_NO_BACKING ;qdict_del (options,"backing" ); }
qemu-doc.texi +7 -0
@@ -2773,6 +2773,13 @@ or ``ivshmem-doorbell`` device types. The ``xlnx-ep108'' machine has been replaced by the ``xlnx-zcu102'' machine. The ``xlnx-zcu102'' machine has the same features and capabilites in QEMU. +@section Block device options + +@subsection "backing": "" (since 2.12.0) + +In order to prevent QEMU from automatically opening an image's backing +chain, use ``"backing": null'' instead. + @node License @appendix License
qemu-options.hx +2 -2
@@ -743,8 +743,8 @@ Reference to or definition of the data source block driver node @item backing Reference to or definition of the backing file block device (default is taken -from the image file). It is allowed to pass an empty string here in order to -disable the default backing file. +from the image file). It is allowed to pass @code{null} here in order to disable +the default backing file. @item lazy-refcounts Whether to enable the lazy refcounts feature (on/off; default is taken from the
Signature · 1 line
2.14.3
Re: [Qemu-devel] [PATCH v2 6/6] block: Deprecate "backing": ""
Quoted 9 lines · Max Reitz
We have a clear replacement, so let's deprecate it.
Signed-off-by Max Reitz <[email protected]>--- qapi/block-core.json | 4 ++-- block.c | 4 ++++ qemu-doc.texi | 7 +++++++ qemu-options.hx | 4 ++-- 4 files changed, 15 insertions(+), 4 deletions(-)
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [Qemu-devel] [PATCH v2 6/6] block: Deprecate "backing": ""
In reply to Max ReitzQuoted 3 lines · Max Reitz
We have a clear replacement, so let's deprecate it.
Signed-off-by Max Reitz <[email protected]>
Berto