qapi: Elide redundant has_FOO in generated C
Subsystems (4)
v3 cover qapi: Elide redundant has_FOO in generated C
In QAPI, absent optional members are distinct from any present value. We thus represent an optional schema member FOO as two C members: a FOO with the member's type, and a bool has_FOO. Likewise for function arguments.
However, the has_FOO is actually redundant for a pointer-valued FOO, which can be null only when has_FOO is false, i.e. has_FOO == !!FOO. Except for arrays, where we a null FOO can also be a present empty array.
The redundant has_FOO are a nuisance to work with. Improve the generator to elide them.
PATCH 01+02 are trivial documentation cleanups.
PATCH 03 tweaks an example in documentation so it'll show the change.
PATCH 04 improves the code generator, but nerfs the change for the schema modules where handwritten code needs to be updated.
PATCH 05-07,10-29 un-nerf in reviewable chunks. Their commit messages refer back to PATCH 04 for an explanation of the transformation. Please read that first. Note that these patches combine the mechanical transformation with obvious, local follow-up simplifications. If you want them separate for easier review, let me know.
PATCH 08+09 clean up in preparation for PATCH 10.
PATCH 28 drops the nerfing code.
v3:
* Rebased
- Straighforward conflict with commit 58684155e4 "qcow: switch to *_co_* functions" resolved in PATCH 10
- Straighforward conflict with commit 53b85d9574 "net: introduce qemu_set_info_str() function" in PATCH 18
- Semantic conflict with commit 8801ccd050 "vhost-vdpa: allow passing opened vhostfd to vhost-vdpa" in PATCH 18
- Straighforward conflict with commit a124109422 "qga: Move HW address getting to a separate function" in PATCH 29
* PATCH 07: Fix sndio backend [Stefan]
* PATCH 08+09: New; PATCH 10 adjusted for them
* PATCH 10: Fix for #ifndef LIBRBD_SUPPORTS_ENCRYPTION [Stefan]
* PATCH 10+26: Back out incorrect cleanup of qmp_transaction() in PATCH 10, adjust PATCH 26, and explain it in its commit message
* PATCH 11: Commit message tweaked [Philippe]
* PATCH 17: Drop superfluous conditional around g_strdup() [David]
* PATCH 20: Update stubs/qdev.c, too [Stefan]
* PATCH 23: Commit message tweaked [Philippe]
v2:
* Rebased
- Straighforward conflicts with commit bf0c50d4aa "monitor: expose monitor_puts to rest of code" resolved in PATCH 08+17
- Commit 90c066cd68 "qmp: add QMP command x-query-virtio-status" necessitates nerfing qapi/virtio.json in PATCH 04, un-nerfing in new PATCH 26
* PATCH 14: Redundant check of params-tls_creds dropped [Philippe]
* PATCH 09+16+27: Fix for Windows
Markus Armbruster (30):
docs/devel/qapi-code-gen: Update example to match current code
qapi: Tidy up whitespace in generated code docs/devel/qapi-code-gen: Extend example for next commit's change
qapi: Start to elide redundant has_FOO in generated C qapi tests: Elide redundant has_FOO in generated C qapi acpi: Elide redundant has_FOO in generated C
qapi audio: Elide redundant has_FOO in generated C
blockdev: Clean up abuse of DriveBackup member format nbd/server: Clean up abuse of BlockExportOptionsNbd member @arg qapi block: Elide redundant has_FOO in generated C qapi chardev: Elide redundant has_FOO in generated C qapi crypto: Elide redundant has_FOO in generated C qapi dump: Elide redundant has_FOO in generated C
qapi job: Elide redundant has_FOO in generated C
qapi machine: Elide redundant has_FOO in generated C qapi migration: Elide redundant has_FOO in generated C qapi misc: Elide redundant has_FOO in generated C
qapi net: Elide redundant has_FOO in generated C
qapi pci: Elide redundant has_FOO in generated C
qapi qdev qom: Elide redundant has_FOO in generated C qapi replay: Elide redundant has_FOO in generated C qapi rocker: Elide redundant has_FOO in generated C qapi run-state: Elide redundant has_FOO in generated C qapi stats: Elide redundant has_FOO in generated C qapi tpm: Elide redundant has_FOO in generated C
qapi transaction: Elide redundant has_FOO in generated C qapi ui: Elide redundant has_FOO in generated C
qapi virtio: Elide redundant has_FOO in generated C qapi qga: Elide redundant has_FOO in generated C
qapi: Drop temporary logic to support conversion step by step
docs/devel/qapi-code-gen.rst | 29 +++- docs/devel/writing-monitor-commands.rst | 14 +- include/monitor/monitor.h | 3 +- audio/alsaaudio.c | 2 +- audio/audio.c | 6 +- audio/audio_legacy.c | 17 +-- audio/ossaudio.c | 8 +- audio/paaudio.c | 12 +- audio/sndioaudio.c | 2 +- audio/wavaudio.c | 2 +- backends/tpm/tpm_passthrough.c | 2 - block/block-backend.c | 2 +- block/copy-before-write.c | 2 +- block/dirty-bitmap.c | 1 - block/export/export.c | 2 +- block/export/vduse-blk.c | 3 +- block/gluster.c | 3 - block/monitor/block-hmp-cmds.c | 48 +++--- block/qapi-sysemu.c | 73 +++------ block/qapi.c | 62 +++----- block/qcow.c | 10 +- block/qcow2.c | 18 +-- block/qed.c | 2 +- block/quorum.c | 2 +- block/rbd.c | 15 +- block/ssh.c | 2 +- blockdev-nbd.c | 9 +- blockdev.c | 185 ++++++++++------------- blockjob.c | 2 - chardev/char-file.c | 4 +- chardev/char-socket.c | 10 +- chardev/char-udp.c | 1 - chardev/char.c | 6 +- crypto/block-luks.c | 16 +- dump/dump.c | 4 +- hw/acpi/core.c | 14 +- hw/acpi/cpu.c | 1 - hw/acpi/memory_hotplug.c | 3 +- hw/core/machine-hmp-cmds.c | 2 +- hw/core/machine-qmp-cmds.c | 9 +- hw/core/machine.c | 10 +- hw/core/numa.c | 8 +- hw/core/qdev.c | 2 +- hw/mem/pc-dimm.c | 1 - hw/net/rocker/rocker_of_dpa.c | 13 +- hw/net/virtio-net.c | 3 +- hw/nvram/fw_cfg.c | 2 +- hw/pci/pci.c | 2 - hw/ppc/spapr.c | 2 +- hw/ppc/spapr_drc.c | 3 +- hw/virtio/virtio-mem-pci.c | 4 +- hw/virtio/virtio-pmem-pci.c | 1 - hw/virtio/virtio.c | 1 - job-qmp.c | 3 +- migration/block-dirty-bitmap.c | 4 +- migration/colo.c | 1 - migration/migration.c | 27 +--- monitor/hmp-cmds.c | 84 +++++----- monitor/misc.c | 21 +-- monitor/qmp-cmds.c | 11 +- nbd/server.c | 15 +- net/announce.c | 8 +- net/hub.c | 2 +- net/l2tpv3.c | 2 +- net/net.c | 25 ++- net/slirp.c | 4 +- net/socket.c | 18 +-- net/tap-win32.c | 2 +- net/tap.c | 51 +++---- net/vhost-vdpa.c | 6 +- qemu-img.c | 13 +- qemu-nbd.c | 2 - qga/commands-posix.c | 32 +--- qga/commands-win32.c | 40 +---- qga/commands.c | 11 +- qom/qom-qmp-cmds.c | 7 +- replay/replay-debugging.c | 1 - softmmu/runstate.c | 18 +-- softmmu/vl.c | 2 +- stubs/qdev.c | 6 +- target/arm/monitor.c | 1 - target/i386/cpu-sysemu.c | 7 +- target/i386/cpu.c | 1 - target/s390x/cpu_models_sysemu.c | 1 - tests/qtest/fuzz/qos_fuzz.c | 3 +- tests/qtest/qmp-cmd-test.c | 2 +- tests/unit/test-char.c | 1 - tests/unit/test-crypto-block.c | 6 - tests/unit/test-qmp-cmds.c | 26 ++-- tests/unit/test-qmp-event.c | 4 +- tests/unit/test-qobject-input-visitor.c | 2 +- tests/unit/test-qobject-output-visitor.c | 2 - tests/unit/test-visitor-serialization.c | 3 +- ui/console.c | 4 +- ui/input.c | 4 +- ui/spice-core.c | 5 - ui/vnc.c | 10 -- util/qemu-config.c | 17 +-- scripts/qapi/commands.py | 9 +- scripts/qapi/events.py | 3 +- scripts/qapi/gen.py | 2 +- scripts/qapi/schema.py | 14 ++ scripts/qapi/types.py | 2 +- scripts/qapi/visit.py | 17 ++- 104 files changed, 487 insertions(+), 735 deletions(-)
Signature · 1 line
2.37.3
PATCH v3 1/30 docs/devel/qapi-code-gen: Update example to match current code
--- docs/devel/qapi-code-gen.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
docs/devel/qapi-code-gen.rst +1 -1
@@ -1748,7 +1748,7 @@ Example:: QTAILQ_INIT(cmds); qmp_register_command(cmds, "my-command", - qmp_marshal_my_command, QCO_NO_OPTIONS); + qmp_marshal_my_command, 0, 0); } [Uninteresting stuff omitted...]
Signature · 1 line
2.37.3
PATCH v3 2/30 qapi: Tidy up whitespace in generated code
In reply to Markus Armbruster--- docs/devel/qapi-code-gen.rst | 1 - scripts/qapi/commands.py | 7 +++---- scripts/qapi/events.py | 1 - 3 files changed, 3 insertions(+), 6 deletions(-)
docs/devel/qapi-code-gen.rst +0 -1
@@ -1664,7 +1664,6 @@ Example:: $ cat qapi-generated/example-qapi-commands.c [Uninteresting stuff omitted...] - static void qmp_marshal_output_UserDefOne(UserDefOne *ret_in, QObject **ret_out, Error **errp) {
scripts/qapi/commands.py +3 -4
@@ -83,7 +83,7 @@ def gen_call(name: str, trace_qmp_enter_%(name)s(req_json->str); } - ''', +''', upper=upper, name=name) ret += mcgen('''
@@ -124,13 +124,13 @@ def gen_call(name: str, trace_qmp_exit_%(name)s(ret_json->str, true); } - ''', +''', upper=upper, name=name) else: ret += mcgen(''' trace_qmp_exit_%(name)s("{}", true); - ''', +''', name=name) return ret
@@ -316,7 +316,6 @@ def _begin_user_module(self, name: str) -> None: #include "qapi/error.h" #include "%(visit)s.h" #include "%(commands)s.h" - ''', commands=commands, visit=visit))
scripts/qapi/events.py +0 -1
@@ -196,7 +196,6 @@ def _begin_user_module(self, name: str) -> None: #include "qapi/error.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp-event.h" - ''', events=events, visit=visit, prefix=self._prefix))
Signature · 1 line
2.37.3
PATCH v3 3/30 docs/devel/qapi-code-gen: Extend example for next commit's change
In reply to Markus ArmbrusterThe next commit will change the code generated for some optional members. The example schema contains an optional member affected by the change. Add one that is not affected.
--- docs/devel/qapi-code-gen.rst | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-)
docs/devel/qapi-code-gen.rst +20 -1
@@ -1357,7 +1357,7 @@ qmp_my_command(); everything else is produced by the generator. :: $ cat example-schema.json { 'struct': 'UserDefOne', - 'data': { 'integer': 'int', '*string': 'str' } } + 'data': { 'integer': 'int', '*string': 'str', '*flag': 'bool' } } { 'command': 'my-command', 'data': { 'arg1': ['UserDefOne'] },
@@ -1412,6 +1412,8 @@ Example:: int64_t integer; bool has_string; char *string; + bool has_flag; + bool flag; }; void qapi_free_UserDefOne(UserDefOne *obj);
@@ -1531,6 +1533,11 @@ Example:: return false; } } + if (visit_optional(v, "flag", &obj->has_flag)) { + if (!visit_type_bool(v, "flag", &obj->flag, errp)) { + return false; + } + } return true; }
@@ -1916,6 +1923,12 @@ Example:: { "type", QLIT_QSTR("str"), }, {} })), + QLIT_QDICT(((QLitDictEntry[]) { + { "default", QLIT_QNULL, }, + { "name", QLIT_QSTR("flag"), }, + { "type", QLIT_QSTR("bool"), }, + {} + })), {} })), }, { "meta-type", QLIT_QSTR("object"), },
@@ -1949,6 +1962,12 @@ Example:: { "name", QLIT_QSTR("str"), }, {} })), + QLIT_QDICT(((QLitDictEntry[]) { + { "json-type", QLIT_QSTR("boolean"), }, + { "meta-type", QLIT_QSTR("builtin"), }, + { "name", QLIT_QSTR("bool"), }, + {} + })), {} }));
Signature · 1 line
2.37.3
PATCH v3 4/30 qapi: Start to elide redundant has_FOO in generated C
In reply to Markus ArmbrusterIn QAPI, absent optional members are distinct from any present value. We thus represent an optional schema member FOO as two C members: a FOO with the member's type, and a bool has_FOO. Likewise for function arguments.
However, has_FOO is actually redundant for a pointer-valued FOO, which can be null only when has_FOO is false, i.e. has_FOO == !!FOO. Except for arrays, where we a null FOO can also be a present empty array.
The redundant has_FOO are a nuisance to work with. Improve the generator to elide them. Uses of has_FOO need to be replaced as follows.
Tests of has_FOO become the equivalent comparison of FOO with null. For brevity, this is commonly done by implicit conversion to bool.
Assignments to has_FOO get dropped.
Likewise for arguments to has_FOO parameters.
Beware: code may violate the invariant has_FOO == !!FOO before the transformation, and get away with it. The above transformation can then break things. Two cases:
* Absent: if code ignores FOO entirely when !has_FOO (except for freeing it if necessary), even non-null / uninitialized FOO works. Such code is known to exist.
* Present: if code ignores FOO entirely when has_FOO, even null FOO works. Such code should not exist.
In both cases, replacing tests of has_FOO by FOO reverts their sense. We have to fix the value of FOO then.
To facilitate review of the necessary updates to handwritten code, add means to opt out of this change, and opt out for all QAPI schema modules where the change requires updates to handwritten code. The next few commits will remove these opt-outs in reviewable chunks, then drop the means to opt out.
--- docs/devel/qapi-code-gen.rst | 5 +-- docs/devel/writing-monitor-commands.rst | 14 ++++---- scripts/qapi/commands.py | 2 +- scripts/qapi/events.py | 2 +- scripts/qapi/gen.py | 2 +- scripts/qapi/schema.py | 48 +++++++++++++++++++++++++ scripts/qapi/types.py | 2 +- scripts/qapi/visit.py | 17 +++++++-- 8 files changed, 77 insertions(+), 15 deletions(-)
docs/devel/qapi-code-gen.rst +3 -2
@@ -1410,7 +1410,6 @@ Example:: struct UserDefOne { int64_t integer; - bool has_string; char *string; bool has_flag; bool flag;
@@ -1525,10 +1524,12 @@ Example:: bool visit_type_UserDefOne_members(Visitor *v, UserDefOne *obj, Error **errp) { + bool has_string = !!obj->string; + if (!visit_type_int(v, "integer", &obj->integer, errp)) { return false; } - if (visit_optional(v, "string", &obj->has_string)) { + if (visit_optional(v, "string", &has_string)) { if (!visit_type_str(v, "string", &obj->string, errp)) { return false; }
docs/devel/writing-monitor-commands.rst +7 -7
@@ -166,9 +166,9 @@ and user defined types. Now, let's update our C implementation in monitor/qmp-cmds.c:: - void qmp_hello_world(bool has_message, const char *message, Error **errp) + void qmp_hello_world(const char *message, Error **errp) { - if (has_message) { + if (message) { printf("%s\n", message); } else { printf("Hello, world\n");
@@ -210,9 +210,9 @@ file. Basically, most errors are set by calling the error_setg() function. Let's say we don't accept the string "message" to contain the word "love". If it does contain it, we want the "hello-world" command to return an error:: - void qmp_hello_world(bool has_message, const char *message, Error **errp) + void qmp_hello_world(const char *message, Error **errp) { - if (has_message) { + if (message) { if (strstr(message, "love")) { error_setg(errp, "the word 'love' is not allowed"); return;
@@ -467,9 +467,9 @@ There are a number of things to be noticed: allocated by the regular g_malloc0() function. Note that we chose to initialize the memory to zero. This is recommended for all QAPI types, as it helps avoiding bad surprises (specially with booleans) -4. Remember that "next_deadline" is optional? All optional members have a - 'has_TYPE_NAME' member that should be properly set by the implementation, - as shown above +4. Remember that "next_deadline" is optional? Non-pointer optional + members have a 'has_TYPE_NAME' member that should be properly set + by the implementation, as shown above 5. Even static strings, such as "alarm_timer->name", should be dynamically allocated by the implementation. This is so because the QAPI also generates a function to free its types and it cannot distinguish between dynamically
scripts/qapi/commands.py +1 -1
@@ -64,7 +64,7 @@ def gen_call(name: str, elif arg_type: assert not arg_type.variants for memb in arg_type.members: - if memb.optional: + if memb.need_has(): argstr += 'arg.has_%s, ' % c_name(memb.name) argstr += 'arg.%s, ' % c_name(memb.name)
scripts/qapi/events.py +1 -1
@@ -60,7 +60,7 @@ def gen_param_var(typ: QAPISchemaObjectType) -> str: for memb in typ.members: ret += sep sep = ', ' - if memb.optional: + if memb.need_has(): ret += 'has_' + c_name(memb.name) + sep if memb.type.name == 'str': # Cast away const added in build_params()
scripts/qapi/gen.py +1 -1
@@ -121,7 +121,7 @@ def build_params(arg_type: Optional[QAPISchemaObjectType], for memb in arg_type.members: ret += sep sep = ', ' - if memb.optional: + if memb.need_has(): ret += 'bool has_%s, ' % c_name(memb.name) ret += '%s %s' % (memb.type.c_param_type(), c_name(memb.name))
scripts/qapi/schema.py +48 -0
66 lines not on this page · raw message
scripts/qapi/types.py +1 -1
@@ -142,7 +142,7 @@ def gen_struct_members(members: List[QAPISchemaObjectTypeMember]) -> str: ret = '' for memb in members: ret += memb.ifcond.gen_if() - if memb.optional: + if memb.need_has(): ret += mcgen(''' bool has_%(c_name)s; ''',
scripts/qapi/visit.py +15 -2
@@ -71,6 +71,16 @@ def gen_visit_object_members(name: str, ''', c_name=c_name(name)) + sep = '' + for memb in members: + if memb.optional and not memb.need_has(): + ret += mcgen(''' + bool has_%(c_name)s = !!obj->%(c_name)s; +''', + c_name=c_name(memb.name)) + sep = '\n' + ret += sep + if base: ret += mcgen(''' if (!visit_type_%(c_type)s_members(v, (%(c_type)s *)obj, errp)) {
@@ -82,10 +92,13 @@ def gen_visit_object_members(name: str, for memb in members: ret += memb.ifcond.gen_if() if memb.optional: + has = 'has_' + c_name(memb.name) + if memb.need_has(): + has = 'obj->' + has ret += mcgen(''' - if (visit_optional(v, "%(name)s", &obj->has_%(c_name)s)) { + if (visit_optional(v, "%(name)s", &%(has)s)) { ''', - name=memb.name, c_name=c_name(memb.name)) + name=memb.name, has=has) indent.increase() special_features = gen_special_features(memb.features) if special_features != '0':
Signature · 1 line
2.37.3
PATCH v3 5/30 qapi tests: Elide redundant has_FOO in generated C
In reply to Markus ArmbrusterThe has_FOO for pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundant has_FOO in generated C" provided the means to elide them step by step. This is the step for tests/qapi-schema/qapi-schema-test.json.
Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here.
--- tests/qtest/qmp-cmd-test.c | 2 +- tests/unit/test-qmp-cmds.c | 26 +++++++++++------------- tests/unit/test-qmp-event.c | 4 ++-- tests/unit/test-qobject-input-visitor.c | 2 +- tests/unit/test-qobject-output-visitor.c | 2 -- tests/unit/test-visitor-serialization.c | 3 +-- scripts/qapi/schema.py | 4 +--- 7 files changed, 18 insertions(+), 25 deletions(-)
tests/qtest/qmp-cmd-test.c +1 -1
@@ -174,7 +174,7 @@ static bool object_type_has_mandatory_members(SchemaInfo *type)g_assert (type->meta_type ==SCHEMA_META_TYPE_OBJECT );for (tail = type->u.object.members; tail; tail = tail->next) { -if (!tail->value->has_q_default) { +if (!tail->value->q_default) {return true; } }
tests/unit/test-qmp-cmds.c +12 -14
@@ -43,15 +43,15 @@ void qmp_user_def_cmd1(UserDefOne * ud1, Error **errp) { } -FeatureStruct1 *qmp_test_features0 (bool has_fs0,FeatureStruct0 *fs0, -bool has_fs1,FeatureStruct1 *fs1, -bool has_fs2,FeatureStruct2 *fs2, -bool has_fs3,FeatureStruct3 *fs3, -bool has_fs4,FeatureStruct4 *fs4, -bool has_cfs1,CondFeatureStruct1 *cfs1, -bool has_cfs2,CondFeatureStruct2 *cfs2, -bool has_cfs3,CondFeatureStruct3 *cfs3, -bool has_cfs4,CondFeatureStruct4 *cfs4, +FeatureStruct1 *qmp_test_features0 (FeatureStruct0 *fs0, +FeatureStruct1 *fs1, +FeatureStruct2 *fs2, +FeatureStruct3 *fs3, +FeatureStruct4 *fs4, +CondFeatureStruct1 *cfs1, +CondFeatureStruct2 *cfs2, +CondFeatureStruct3 *cfs3, +CondFeatureStruct4 *cfs4,Error **errp) {return g_new0 (FeatureStruct1,1 );
@@ -77,8 +77,7 @@ void qmp_test_command_cond_features3(Error **errp) { } -UserDefTwo *qmp_user_def_cmd2 (UserDefOne *ud1a, -bool has_udb1,UserDefOne *ud1b, +UserDefTwo *qmp_user_def_cmd2 (UserDefOne *ud1a,UserDefOne *ud1b,Error **errp) {UserDefTwo *ret;
@@ -87,8 +86,8 @@ UserDefTwo *qmp_user_def_cmd2(UserDefOne *ud1a, ud1c->string =strdup (ud1a->string); ud1c->integer = ud1a->integer; - ud1d->string =strdup (has_udb1 ? ud1b->string :"blah0" ); - ud1d->integer = has_udb1 ? ud1b->integer :0 ; + ud1d->string =strdup (ud1b ? ud1b->string :"blah0" ); + ud1d->integer = ud1b ? ud1b->integer :0 ; ret =g_new0 (UserDefTwo,1 ); ret->string0 =strdup ("blah1" );
@@ -98,7 +97,6 @@ UserDefTwo *qmp_user_def_cmd2(UserDefOne *ud1a, ret->dict1->dict2->userdef = ud1c; ret->dict1->dict2->string =strdup ("blah3" ); ret->dict1->dict3 =g_new0 (UserDefTwoDictDict,1 ); - ret->dict1->has_dict3 = true; ret->dict1->dict3->userdef = ud1d; ret->dict1->dict3->string =strdup ("blah4" );
tests/unit/test-qmp-event.c +2 -2
@@ -109,7 +109,7 @@ static void test_event_c(TestEventData *data, data->expect =qdict_from_jsonf_nofail ("{ 'event': 'EVENT_C', 'data': {" " 'a': 1, 'b': { 'integer': 2, 'string': 'test1' }, 'c': 'test2' } }" ); -qapi_event_send_event_c (true,1 , true, &b,"test2" ); +qapi_event_send_event_c (true,1 , &b,"test2" );g_assert (data->emitted);qobject_unref (data->expect); }
@@ -135,7 +135,7 @@ static void test_event_d(TestEventData *data," 'struct1': { 'integer': 2, 'string': 'test1', 'enum1': 'value1' }," " 'string': 'test2', 'enum2': 'value2' }," " 'b': 'test3', 'enum3': 'value3' } }"); -qapi_event_send_event_d (&a,"test3" , false,NULL , true,ENUM_ONE_VALUE3 ); +qapi_event_send_event_d (&a,"test3" ,NULL , true,ENUM_ONE_VALUE3 );g_assert (data->emitted);qobject_unref (data->expect); }
tests/unit/test-qobject-input-visitor.c +1 -1
@@ -431,7 +431,7 @@ static void test_visitor_in_struct_nested(TestInputVisitorData *data, g_assert_cmpint(udp->dict1->dict2->userdef->integer, ==, 42); g_assert_cmpstr(udp->dict1->dict2->userdef->string, ==, "string"); g_assert_cmpstr(udp->dict1->dict2->string, ==, "string2"); -g_assert (udp->dict1->has_dict3 == false); +g_assert (!udp->dict1->dict3); } static void test_visitor_in_list(TestInputVisitorData *data,
tests/unit/test-qobject-output-visitor.c +0 -2
@@ -182,7 +182,6 @@ static void test_visitor_out_struct_nested(TestOutputVisitorData *data, ud2->dict1->dict2->string =g_strdup (strings[2 ]); ud2->dict1->dict3 =g_malloc0 (sizeof (*ud2->dict1->dict3)); - ud2->dict1->has_dict3 = true; ud2->dict1->dict3->userdef =g_new0 (UserDefOne,1 ); ud2->dict1->dict3->userdef->string =g_strdup (string); ud2->dict1->dict3->userdef->integer = value;
@@ -284,7 +283,6 @@ static void test_visitor_out_list_qapi_free(TestOutputVisitorData *data, value->dict1->dict2->userdef->string =g_strdup (string); value->dict1->dict2->userdef->integer =42 ; value->dict1->dict2->string =g_strdup (string); - value->dict1->has_dict3 = false;QAPI_LIST_PREPEND (head, value); }
tests/unit/test-visitor-serialization.c +1 -2
@@ -223,7 +223,6 @@ static UserDefTwo *nested_struct_create(void) udnp->dict1->dict2->userdef->string =strdup ("test_string" ); udnp->dict1->dict2->string =strdup ("test_string2" ); udnp->dict1->dict3 =g_malloc0 (sizeof (*udnp->dict1->dict3)); - udnp->dict1->has_dict3 = true; udnp->dict1->dict3->userdef =g_new0 (UserDefOne,1 ); udnp->dict1->dict3->userdef->integer =43 ; udnp->dict1->dict3->userdef->string =strdup ("test_string" );
@@ -243,7 +242,7 @@ static void nested_struct_compare(UserDefTwo *udnp1, UserDefTwo *udnp2) udnp2->dict1->dict2->userdef->string); g_assert_cmpstr(udnp1->dict1->dict2->string, ==, udnp2->dict1->dict2->string); -g_assert (udnp1->dict1->has_dict3 == udnp2->dict1->has_dict3); +g_assert (!udnp1->dict1->dict3 == !udnp2->dict1->dict3); g_assert_cmpint(udnp1->dict1->dict3->userdef->integer, ==, udnp2->dict1->dict3->userdef->integer); g_assert_cmpstr(udnp1->dict1->dict3->userdef->string, ==,
scripts/qapi/schema.py +1 -3
@@ -767,7 +767,6 @@ def need_has(self): 'qapi/char.json', 'qapi/crypto.json', 'qapi/dump.json', - 'qapi/introspect.json', 'qapi/job.json', 'qapi/machine.json', 'qapi/machine-target.json',
@@ -785,8 +784,7 @@ def need_has(self): 'qapi/transaction.json', 'qapi/ui.json', 'qapi/virtio.json', - 'qga/qapi-schema.json', - 'tests/qapi-schema/qapi-schema-test.json'] + 'qga/qapi-schema.json'] if self.info and any(self.info.fname.endswith(mod) for mod in opt_out): return self.optional
Signature · 1 line
2.37.3
PATCH v3 6/30 qapi acpi: Elide redundant has_FOO in generated C
In reply to Markus ArmbrusterThe has_FOO for pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundant has_FOO in generated C" provided the means to elide them step by step. This is the step for qapi/acpi.py.
Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here.
--- hw/acpi/core.c | 14 +++++++------- hw/acpi/cpu.c | 1 - hw/acpi/memory_hotplug.c | 1 - scripts/qapi/schema.py | 1 - 4 files changed, 7 insertions(+), 10 deletions(-)
hw/acpi/core.c +7 -7
@@ -185,7 +185,7 @@ static void acpi_table_install(const char unsigned *blob, size_t bloblen, changed_fields =0 ; ext_hdr->_length =cpu_to_le16 (acpi_payload_size); -if (hdrs->has_sig) { +if (hdrs->sig) {strncpy (ext_hdr->sig, hdrs->sig,sizeof ext_hdr->sig); ++changed_fields; }
@@ -204,11 +204,11 @@ static void acpi_table_install(const char unsigned *blob, size_t bloblen, ext_hdr->checksum =0 ; -if (hdrs->has_oem_id) { +if (hdrs->oem_id) {strncpy (ext_hdr->oem_id, hdrs->oem_id,sizeof ext_hdr->oem_id); ++changed_fields; } -if (hdrs->has_oem_table_id) { +if (hdrs->oem_table_id) {strncpy (ext_hdr->oem_table_id, hdrs->oem_table_id,sizeof ext_hdr->oem_table_id); ++changed_fields;
@@ -217,7 +217,7 @@ static void acpi_table_install(const char unsigned *blob, size_t bloblen, ext_hdr->oem_revision =cpu_to_le32 (hdrs->oem_rev); ++changed_fields; } -if (hdrs->has_asl_compiler_id) { +if (hdrs->asl_compiler_id) {strncpy (ext_hdr->asl_compiler_id, hdrs->asl_compiler_id,sizeof ext_hdr->asl_compiler_id); ++changed_fields;
@@ -255,12 +255,12 @@ void acpi_table_add(const QemuOpts *opts, Error **errp)if (!hdrs) { goto out; } -if (hdrs->has_file == hdrs->has_data) { +if (!hdrs->file == !hdrs->data) {error_setg (errp,"'-acpitable' requires one of 'data' or 'file'" ); goto out; } - pathnames =g_strsplit (hdrs->has_file ? hdrs->file : hdrs->data,":" ,0 ); + pathnames =g_strsplit (hdrs->file ?: hdrs->data,":" ,0 );if (pathnames ==NULL || pathnames[0 ] ==NULL ) {error_setg (errp,"'-acpitable' requires at least one pathname" ); goto out;
@@ -297,7 +297,7 @@ void acpi_table_add(const QemuOpts *opts, Error **errp)close (fd); } -acpi_table_install (blob, bloblen, hdrs->has_file, hdrs, errp); +acpi_table_install (blob, bloblen, !!hdrs->file, hdrs, errp); out:g_free (blob);
hw/acpi/cpu.c +0 -1
@@ -35,7 +35,6 @@ static ACPIOSTInfo *acpi_cpu_device_status(int idx, AcpiCpuStatus *cdev)DeviceState *dev =DEVICE (cdev->cpu);if (dev->id) { info->device =g_strdup (dev->id); - info->has_device = true; } }return info;
hw/acpi/memory_hotplug.c +0 -1
@@ -44,7 +44,6 @@ static ACPIOSTInfo *acpi_memory_device_status(int slot, MemStatus *mdev)DeviceState *dev =DEVICE (mdev->dimm);if (dev->id) { info->device =g_strdup (dev->id); - info->has_device = true; } }return info;
scripts/qapi/schema.py +0 -1
@@ -759,7 +759,6 @@ def need_has(self): assert self.type # Temporary hack to support dropping the has_FOO in reviewable chunks opt_out = [ - 'qapi/acpi.json', 'qapi/audio.json', 'qapi/block-core.json', 'qapi/block-export.json',
Signature · 1 line
2.37.3
PATCH v3 7/30 qapi audio: Elide redundant has_FOO in generated C
In reply to Markus ArmbrusterThe has_FOO for pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundant has_FOO in generated C" provided the means to elide them step by step. This is the step for qapi/audio.json.
Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here.
Additionally, helper get_str() loses its @has_dst parameter.
--- audio/alsaaudio.c | 2 +- audio/audio.c | 6 ++---- audio/audio_legacy.c | 17 +++++++---------- audio/ossaudio.c | 8 +++----- audio/paaudio.c | 12 ++++++------ audio/sndioaudio.c | 2 +- audio/wavaudio.c | 2 +- scripts/qapi/schema.py | 1 - 8 files changed, 21 insertions(+), 29 deletions(-)
audio/alsaaudio.c +1 -1
@@ -449,7 +449,7 @@ static int alsa_open(bool in, struct alsa_params_req *req,snd_pcm_hw_params_t *hw_params;int err;unsigned int freq, nchannels; -const char *pcm_name = apdo->has_dev ? apdo->dev :"default" ; +const char *pcm_name = apdo->dev ?:"default" ;snd_pcm_uframes_t obt_buffer_size;const char *typ = in ?"ADC" :"DAC" ;snd_pcm_format_t obtfmt;
audio/audio.c +2 -4
@@ -2031,15 +2031,13 @@ void audio_create_pdos(Audiodev *dev)switch (dev->driver) {#define CASE (DRIVER , driver, pdo_name) \ case AUDIODEV_DRIVER_##DRIVER: \ - if (!dev->u.driver.has_in) { \ + if (!dev->u.driver.in) { \ dev->u.driver.in = g_malloc0( \ sizeof(Audiodev##pdo_name##PerDirectionOptions)); \ - dev->u.driver.has_in = true; \ } \ - if (!dev->u.driver.has_out) { \ + if (!dev->u.driver.out) { \ dev->u.driver.out = g_malloc0( \ sizeof(Audiodev##pdo_name##PerDirectionOptions)); \ - dev->u.driver.has_out = true; \ } \ break
audio/audio_legacy.c +7 -10
@@ -62,15 +62,12 @@ static void get_int(const char *env, uint32_t *dst, bool *has_dst) } } -static void get_str (const char *env,char **dst,bool *has_dst) +static void get_str (const char *env,char **dst) {const char *val =getenv (env);if (val) { -if (*has_dst) { -g_free (*dst); - } +g_free (*dst); *dst =g_strdup (val); - *has_dst = true; } }
@@ -169,7 +166,7 @@ static void handle_alsa_per_direction(get_bool (buf, &apdo->try_poll, &apdo->has_try_poll);strcpy (buf + len,"DEV" ); -get_str (buf, &apdo->dev, &apdo->has_dev); +get_str (buf, &apdo->dev);strcpy (buf + len,"SIZE_IN_USEC" );get_bool (buf, &size_in_usecs, &dummy);
@@ -235,7 +232,7 @@ static void handle_oss_per_direction( const char *dev_env) {get_bool (try_poll_env, &opdo->try_poll, &opdo->has_try_poll); -get_str (dev_env, &opdo->dev, &opdo->has_dev); +get_str (dev_env, &opdo->dev); get_bytes_to_usecs("QEMU_OSS_FRAGSIZE", &opdo->buffer_length, &opdo->has_buffer_length,
@@ -261,7 +258,7 @@ static void handle_oss(Audiodev *dev)static void handle_pa_per_direction (AudiodevPaPerDirectionOptions *ppdo,const char *env) { -get_str (env, &ppdo->name, &ppdo->has_name); +get_str (env, &ppdo->name); }static void handle_pa (Audiodev *dev)
@@ -278,7 +275,7 @@ static void handle_pa(Audiodev *dev) &dev->u.pa.out->has_buffer_length, qapi_AudiodevPaPerDirectionOptions_base(dev->u.pa.out)); -get_str ("QEMU_PA_SERVER" , &dev->u.pa.server, &dev->u.pa.has_server); +get_str ("QEMU_PA_SERVER" , &dev->u.pa.server); }/* SDL */
@@ -299,7 +296,7 @@ static void handle_wav(Audiodev *dev) &dev->u.wav.out->has_format);get_int ("QEMU_WAV_DAC_FIXED_CHANNELS" , &dev->u.wav.out->channels, &dev->u.wav.out->has_channels); -get_str ("QEMU_WAV_PATH" , &dev->u.wav.path, &dev->u.wav.has_path); +get_str ("QEMU_WAV_PATH" , &dev->u.wav.path); }/* general */
audio/ossaudio.c +3 -5
@@ -252,7 +252,7 @@ static int oss_open(int in, struct oss_params *req, audsettings *as,audio_buf_info abinfo;int fmt, freq, nchannels;int setfragment =1 ; -const char *dspname = opdo->has_dev ? opdo->dev :"/dev/dsp" ; +const char *dspname = opdo->dev ?:"/dev/dsp" ;const char *typ = in ?"ADC" :"DAC" ;#ifdef USE_DSP_POLICY int policy = oopts->has_dsp_policy ? oopts->dsp_policy :5 ;
@@ -745,10 +745,8 @@ static void *oss_audio_init(Audiodev *dev)oss_init_per_direction (oopts->in);oss_init_per_direction (oopts->out); -if (access (oopts->in->has_dev ? oopts->in->dev :"/dev/dsp" , -R_OK |W_OK ) <0 || -access (oopts->out->has_dev ? oopts->out->dev :"/dev/dsp" , -R_OK |W_OK ) <0 ) { +if (access (oopts->in->dev ?:"/dev/dsp" ,R_OK |W_OK ) <0 || +access (oopts->out->dev ?:"/dev/dsp" ,R_OK |W_OK ) <0 ) {return NULL ; }return dev;
audio/paaudio.c +6 -6
@@ -536,9 +536,9 @@ static int qpa_init_out(HWVoiceOut *hw, struct audsettings *as, pa->stream =qpa_simple_new ( c, - ppdo->has_stream_name ? ppdo->stream_name : g->dev->id, + ppdo->stream_name ?: g->dev->id,PA_STREAM_PLAYBACK , - ppdo->has_name ? ppdo->name :NULL , + ppdo->name, &ss, &ba,/* buffering attributes */ &error
@@ -585,9 +585,9 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque) pa->stream =qpa_simple_new ( c, - ppdo->has_stream_name ? ppdo->stream_name : g->dev->id, + ppdo->stream_name ?: g->dev->id,PA_STREAM_RECORD , - ppdo->has_name ? ppdo->name :NULL , + ppdo->name, &ss, &ba,/* buffering attributes */ &error
@@ -827,7 +827,7 @@ static void *qpa_audio_init(Audiodev *dev)assert (dev->driver ==AUDIODEV_DRIVER_PA ); -if (!popts->has_server) { +if (!popts->server) {char pidfile[64 ];char *runtime;struct stat st;
@@ -850,7 +850,7 @@ static void *qpa_audio_init(Audiodev *dev) } g =g_new0 (paaudio,1 ); - server = popts->has_server ? popts->server :NULL ; + server = popts->server; g->dev = dev;
audio/sndioaudio.c +1 -1
@@ -333,7 +333,7 @@ static int sndio_init(SndioVoice *self,unsigned int nch;int i, nfds; - dev_name = opts->has_dev ? opts->dev :SIO_DEVANY ; + dev_name = opts->dev ?:SIO_DEVANY ; latency = opts->has_latency ? opts->latency :SNDIO_LATENCY_US ;/* open the device in non-blocking mode */
audio/wavaudio.c +1 -1
@@ -78,7 +78,7 @@ static int wav_init_out(HWVoiceOut *hw, struct audsettings *as,Audiodev *dev = drv_opaque;AudiodevWavOptions *wopts = &dev->u.wav;struct audsettings wav_as =audiodev_to_audsettings (dev->u.wav.out); -const char *wav_path = wopts->has_path ? wopts->path :"qemu.wav" ; +const char *wav_path = wopts->path ?:"qemu.wav" ; stereo = wav_as.nchannels ==2 ;switch (wav_as.fmt) {
scripts/qapi/schema.py +0 -1
@@ -759,7 +759,6 @@ def need_has(self): assert self.type # Temporary hack to support dropping the has_FOO in reviewable chunks opt_out = [ - 'qapi/audio.json', 'qapi/block-core.json', 'qapi/block-export.json', 'qapi/block.json',
Signature · 1 line
2.37.3
PATCH v3 8/30 blockdev: Clean up abuse of DriveBackup member format
In reply to Markus Armbrusterdrive-backup argument @format defaults to the format of the source unless @mode is "existing".
drive_backup_prepare() implements this by copying the source's @format_name to DriveBackup member @format. It leaves @has_format false, violating the "has_format == !!format" invariant. Unclean. Falls apart when we elide @has_format (commit after next): then QAPI passes @format, which is a string constant, to g_free(). iotest 056 duly explodes.
Clean it up. Since the value stored in member @format is not actually used outside this function, use a local variable instead of modifying the QAPI object.
--- blockdev.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
blockdev.c +9 -8
@@ -1686,6 +1686,7 @@ static void drive_backup_prepare(BlkActionState *common, Error **errp)BlockDriverState *source =NULL ;AioContext *aio_context;AioContext *old_context; +const char *format;QDict *options;Error *local_err =NULL ;int flags;
@@ -1717,9 +1718,9 @@ static void drive_backup_prepare(BlkActionState *common, Error **errp)/* Paired with .clean() */ bdrv_drained_begin (bs); -if (!backup->has_format) { - backup->format = backup->mode ==NEW_IMAGE_MODE_EXISTING ? -NULL : (char *) bs->drv->format_name; + format = backup->format; +if (!format && backup->mode !=NEW_IMAGE_MODE_EXISTING ) { + format = bs->drv->format_name; }/* Early check to avoid creating target */
@@ -1758,19 +1759,19 @@ static void drive_backup_prepare(BlkActionState *common, Error **errp) }if (backup->mode !=NEW_IMAGE_MODE_EXISTING ) { -assert (backup->format); +assert (format);if (source) {/* Implicit filters should not appear in the filename */ BlockDriverState *explicit_backing =bdrv_skip_implicit_filters (source);bdrv_refresh_filename (explicit_backing); -bdrv_img_create (backup->target, backup->format, +bdrv_img_create (backup->target, format, explicit_backing->filename, explicit_backing->drv->format_name,NULL , size, flags, false, &local_err); }else { -bdrv_img_create (backup->target, backup->format,NULL ,NULL ,NULL , +bdrv_img_create (backup->target, format,NULL ,NULL ,NULL , size, flags, false, &local_err); } }
@@ -1783,8 +1784,8 @@ static void drive_backup_prepare(BlkActionState *common, Error **errp) options =qdict_new ();qdict_put_str (options,"discard" ,"unmap" );qdict_put_str (options,"detect-zeroes" ,"unmap" ); -if (backup->format) { -qdict_put_str (options,"driver" , backup->format); +if (format) { +qdict_put_str (options,"driver" , format); } target_bs =bdrv_open (backup->target,NULL , options, flags, errp);
Signature · 1 line
2.37.3
Re: [PATCH v3 08/30] blockdev: Clean up abuse of DriveBackup member format
Quoted 14 lines · Markus Armbruster
drive-backup argument @format defaults to the format of the source unless @mode is "existing".
drive_backup_prepare()implements this by copying the source's @format_name to DriveBackup member @format. It leaves @has_format false, violating the "has_format== !!format" invariant. Unclean. Falls apart when we elide @has_format (commit after next): then QAPI passes @format, which is a string constant, tog_free(). iotest 056 duly explodes.Clean it up. Since the value stored in member @format is not actually used outside this function, use a local variable instead of modifying the QAPI object.
Quoted 8 lines
Signed-off-by Markus Armbruster <[email protected]>Cc Kevin Wolf <[email protected]>Cc Hanna Reitz <[email protected]>--- blockdev.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
PATCH v3 9/30 nbd/server: Clean up abuse of BlockExportOptionsNbd member @arg
In reply to Markus Armbrusterblock-export-add argument @name defaults to the value of argument @node-name.
nbd_export_create() implements this by copying @node_name to @name. It leaves @has_node_name false, violating the "has_node_name == !!node_name" invariant. Unclean. Falls apart when we elide @has_node_name (next commit): then QAPI frees the same value twice, once for @node_name and once @name. iotest 307 duly explodes.
Goes back to commit c62d24e906 "blockdev-nbd: Boxed argument type for nbd-server-add" (v5.0.0). Got moved from qmp_nbd_server_add() to nbd_export_create() (commit 56ee86261e), then copied back (commit b6076afcab). Commit 8675cbd68b "nbd: Utilize QAPI_CLONE for type conversion" (v5.2.0) cleaned up the copy in qmp_nbd_server_add() noting
Second, our assignment to arg->name is fishy: the generated QAPI code
for qapi_free_NbdServerAddOptions does not visit arg->name if
arg->has_name is false, but if it DID visit it, we would have
introduced a double-free situation when arg is finally freed.Exactly. However, the copy in nbd_export_create() remained dirty.
Clean it up. Since the value stored in member @name is not actually used outside this function, use a local variable instead of modifying the QAPI object.
--- nbd/server.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
nbd/server.c +6 -9
@@ -1638,6 +1638,7 @@ static int nbd_export_create(BlockExport *blk_exp, BlockExportOptions *exp_args, {NBDExport *exp =container_of (blk_exp, NBDExport, common);BlockExportOptionsNbd *arg = &exp_args->u.nbd; +const char *name = arg->name ?: exp_args->node_name;BlockBackend *blk = blk_exp->blk;int64_t size;uint64_t perm, shared_perm;
@@ -1653,12 +1654,8 @@ static int nbd_export_create(BlockExport *blk_exp, BlockExportOptions *exp_args,return -EINVAL ; } -if (!arg->has_name) { - arg->name = exp_args->node_name; - } - -if (strlen (arg->name) >NBD_MAX_STRING_SIZE ) { -error_setg (errp,"export name '%s' too long" , arg->name); +if (strlen (name) >NBD_MAX_STRING_SIZE ) { +error_setg (errp,"export name '%s' too long" , name);return -EINVAL ; }
@@ -1667,8 +1664,8 @@ static int nbd_export_create(BlockExport *blk_exp, BlockExportOptions *exp_args,return -EINVAL ; } -if (nbd_export_find (arg->name)) { -error_setg (errp,"NBD server already has export named '%s'" , arg->name); +if (nbd_export_find (name)) { +error_setg (errp,"NBD server already has export named '%s'" , name);return -EEXIST ; }
@@ -1688,7 +1685,7 @@ static int nbd_export_create(BlockExport *blk_exp, BlockExportOptions *exp_args, }QTAILQ_INIT (&exp->clients); - exp->name =g_strdup (arg->name); + exp->name =g_strdup (name); exp->description =g_strdup (arg->description); exp->nbdflags = (NBD_FLAG_HAS_FLAGS |NBD_FLAG_SEND_FLUSH |NBD_FLAG_SEND_FUA |NBD_FLAG_SEND_CACHE );
Signature · 1 line
2.37.3
Re: [PATCH v3 09/30] nbd/server: Clean up abuse of BlockExportOptionsNbd member @arg
Quoted 27 lines · Markus Armbruster
block-export-add argument @name defaults to the value of argument @node-name.
nbd_export_create()implements this by copying @node_name to @name. It leaves @has_node_name false, violating the "has_node_name== !!node_name" invariant. Unclean. Falls apart when we elide @has_node_name (next commit): then QAPI frees the same value twice, once for @node_name and once @name. iotest 307 duly explodes.Goes back to commit
c62d24e906"blockdev-nbd: Boxed argument type for nbd-server-add" (v5.0.0). Got moved fromqmp_nbd_server_add()tonbd_export_create()(commit56ee86261e), then copied back (commitb6076afcab). Commit8675cbd68b"nbd: UtilizeQAPI_CLONEfor type conversion" (v5.2.0) cleaned up the copy inqmp_nbd_server_add()notingSecond, our assignment to arg->name is fishy: the generated QAPI code for qapi_free_NbdServerAddOptions does not visit arg->name if arg->has_name is false, but if it DID visit it, we would have introduced a double-free situation when arg is finally freed.Exactly. However, the copy in
nbd_export_create()remained dirty.Clean it up. Since the value stored in member @name is not actually used outside this function, use a local variable instead of modifying the QAPI object.
Quoted 8 lines
Signed-off-by Markus Armbruster <[email protected]>Cc Eric Blake <[email protected]>Cc Vladimir Sementsov-Ogievskiy <[email protected]>--- nbd/server.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [PATCH v3 09/30] nbd/server: Clean up abuse of BlockExportOptionsNbd member @arg
In reply to Markus ArmbrusterQuoted 23 lines · Markus Armbruster
block-export-add argument @name defaults to the value of argument @node-name.
nbd_export_create()implements this by copying @node_name to @name. It leaves @has_node_name false, violating the "has_node_name== !!node_name" invariant. Unclean. Falls apart when we elide @has_node_name (next commit): then QAPI frees the same value twice, once for @node_name and once @name. iotest 307 duly explodes.Goes back to commit
c62d24e906"blockdev-nbd: Boxed argument type for nbd-server-add" (v5.0.0). Got moved fromqmp_nbd_server_add()tonbd_export_create()(commit56ee86261e), then copied back (commitb6076afcab). Commit8675cbd68b"nbd: UtilizeQAPI_CLONEfor type conversion" (v5.2.0) cleaned up the copy inqmp_nbd_server_add()notingSecond, our assignment to arg->name is fishy: the generated QAPI code for qapi_free_NbdServerAddOptions does not visit arg->name if arg->has_name is false, but if it DID visit it, we would have introduced a double-free situation when arg is finally freed.Exactly. However, the copy in
nbd_export_create()remained dirty.
Quoted 8 lines
Clean it up. Since the value stored in member @name is not actually used outside this function, use a local variable instead of modifying the QAPI object.
Signed-off-by Markus Armbruster<[email protected]>Cc Eric Blake<[email protected]>Cc Vladimir Sementsov-Ogievskiy<[email protected]>
Signature · 2 lines
Best regards, Vladimir
PATCH v3 10/30 qapi block: Elide redundant has_FOO in generated C
In reply to Markus ArmbrusterThe has_FOO for pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundant has_FOO in generated C" provided the means to elide them step by step. This is the step for qapi/block*.json.
Said commit explains the transformation in more detail.
There is one instance of the invariant violation mentioned there:qcow2_signal_corruption() passes false, "" when node_name is an empty string. Take care to pass NULL then.
The previous two commits cleaned up two more.
Additionally, helper bdrv_latency_histogram_stats() loses its output parameters and returns a value instead.
--- block/block-backend.c | 2 +- block/copy-before-write.c | 2 +- block/dirty-bitmap.c | 1 - block/export/export.c | 2 +- block/export/vduse-blk.c | 3 +- block/gluster.c | 3 - block/monitor/block-hmp-cmds.c | 48 ++++------ block/qapi-sysemu.c | 73 +++++---------- block/qapi.c | 62 +++++-------- block/qcow.c | 10 +- block/qcow2.c | 18 ++-- block/qed.c | 2 +- block/quorum.c | 2 +- block/rbd.c | 15 +-- block/ssh.c | 2 +- blockdev-nbd.c | 9 +- blockdev.c | 164 +++++++++++++-------------------- blockjob.c | 2 - monitor/hmp-cmds.c | 3 +- qemu-img.c | 13 ++- qemu-nbd.c | 2 - scripts/qapi/schema.py | 3 - 22 files changed, 167 insertions(+), 274 deletions(-)
block/block-backend.c +1 -1
@@ -1859,7 +1859,7 @@ static void send_qmp_error_event(BlockBackend *blk,BlockDriverState *bs =blk_bs (blk); optype = is_read ?IO_OPERATION_TYPE_READ :IO_OPERATION_TYPE_WRITE ; -qapi_event_send_block_io_error (blk_name (blk), !!bs, +qapi_event_send_block_io_error (blk_name (blk), bs ?bdrv_get_node_name (bs) :NULL , optype, action,blk_iostatus_is_enabled (blk), error ==ENOSPC ,strerror (error));
block/copy-before-write.c +1 -1
@@ -432,7 +432,7 @@ static int cbw_open(BlockDriverState *bs, QDict *options, int flags,return -EINVAL ; } -if (opts->has_bitmap) { +if (opts->bitmap) { bitmap =block_dirty_bitmap_lookup (opts->bitmap->node, opts->bitmap->name,NULL , errp);if (!bitmap) {
block/dirty-bitmap.c +0 -1
@@ -541,7 +541,6 @@ BlockDirtyInfoList *bdrv_query_dirty_bitmaps(BlockDriverState *bs) info->count =bdrv_get_dirty_count (bm); info->granularity =bdrv_dirty_bitmap_granularity (bm); - info->has_name = !!bm->name; info->name =g_strdup (bm->name); info->recording =bdrv_dirty_bitmap_recording (bm); info->busy =bdrv_dirty_bitmap_busy (bm);
block/export/export.c +1 -1
@@ -114,7 +114,7 @@ BlockExport *blk_exp_add(BlockExportOptions *export, Error **errp) ctx =bdrv_get_aio_context (bs);aio_context_acquire (ctx); -if (export->has_iothread) { +if (export->iothread) {IOThread *iothread;AioContext *new_ctx;Error **set_context_errp;
block/export/vduse-blk.c +1 -2
@@ -265,8 +265,7 @@ static int vduse_blk_exp_create(BlockExport *exp, BlockExportOptions *opts, } vblk_exp->num_queues = num_queues; vblk_exp->handler.blk = exp->blk; - vblk_exp->handler.serial =g_strdup (vblk_opts->has_serial ? - vblk_opts->serial :"" ); + vblk_exp->handler.serial =g_strdup (vblk_opts->serial ?:"" ); vblk_exp->handler.logical_block_size = logical_block_size; vblk_exp->handler.writable = opts->writable;
block/gluster.c +0 -3
@@ -830,7 +830,6 @@ static int qemu_gluster_open(BlockDriverState *bs, QDict *options, s->logfile =g_strdup (logfile ? logfile :GLUSTER_LOGFILE_DEFAULT ); gconf->logfile =g_strdup (s->logfile); - gconf->has_logfile = true; s->glfs =qemu_gluster_init (gconf, filename, options, errp);if (!s->glfs) {
@@ -917,7 +916,6 @@ static int qemu_gluster_reopen_prepare(BDRVReopenState *state, gconf->debug = s->debug; gconf->has_debug = true; gconf->logfile =g_strdup (s->logfile); - gconf->has_logfile = true;/* * If 'state->bs->exact_filename' is empty, 'state->options' should contain
@@ -1162,7 +1160,6 @@ static int coroutine_fn qemu_gluster_co_create_opts(BlockDriver *drv,if (!gconf->logfile) { gconf->logfile =g_strdup (GLUSTER_LOGFILE_DEFAULT ); } - gconf->has_logfile = true; ret =qemu_gluster_parse (gconf, filename,NULL , errp);if (ret <0 ) {
block/monitor/block-hmp-cmds.c +19 -29
160 lines not on this page · raw message
block/qapi-sysemu.c +25 -48
194 lines not on this page · raw message
block/qapi.c +22 -40
192 lines not on this page · raw message
block/qcow.c +5 -5
@@ -825,7 +825,7 @@ static int coroutine_fn qcow_co_create(BlockdevCreateOptions *opts,return -EINVAL ; } -if (qcow_opts->has_encrypt && +if (qcow_opts->encrypt && qcow_opts->encrypt->format !=Q_CRYPTO_BLOCK_FORMAT_QCOW ) {error_setg (errp,"Unsupported encryption format" );
@@ -853,7 +853,7 @@ static int coroutine_fn qcow_co_create(BlockdevCreateOptions *opts, header.size =cpu_to_be64 (total_size); header_size =sizeof (header); backing_filename_len =0 ; -if (qcow_opts->has_backing_file) { +if (qcow_opts->backing_file) {if (strcmp (qcow_opts->backing_file,"fat:" )) { header.backing_file_offset =cpu_to_be64 (header_size); backing_filename_len =strlen (qcow_opts->backing_file);
@@ -861,7 +861,7 @@ static int coroutine_fn qcow_co_create(BlockdevCreateOptions *opts, header_size += backing_filename_len; }else {/* special backing file for vvfat */ - qcow_opts->has_backing_file = false; + qcow_opts->backing_file =NULL ; } header.cluster_bits =9 ;/* 512 byte cluster to avoid copying unmodified sectors */
@@ -876,7 +876,7 @@ static int coroutine_fn qcow_co_create(BlockdevCreateOptions *opts, header.l1_table_offset =cpu_to_be64 (header_size); -if (qcow_opts->has_encrypt) { +if (qcow_opts->encrypt) { header.crypt_method =cpu_to_be32 (QCOW_CRYPT_AES ); crypto = qcrypto_block_create(qcow_opts->encrypt, "encrypt.",
@@ -895,7 +895,7 @@ static int coroutine_fn qcow_co_create(BlockdevCreateOptions *opts, goto exit; } -if (qcow_opts->has_backing_file) { +if (qcow_opts->backing_file) { ret =blk_co_pwrite (qcow_blk,sizeof (header), backing_filename_len, qcow_opts->backing_file,0 );if (ret <0 ) {
block/qcow2.c +8 -10
@@ -3508,7 +3508,7 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)if (!qcow2_opts->has_preallocation) { qcow2_opts->preallocation =PREALLOC_MODE_OFF ; } -if (qcow2_opts->has_backing_file && +if (qcow2_opts->backing_file && qcow2_opts->preallocation !=PREALLOC_MODE_OFF && !qcow2_opts->extended_l2) {
@@ -3517,7 +3517,7 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp) ret = -EINVAL ; goto out; } -if (qcow2_opts->has_backing_fmt && !qcow2_opts->has_backing_file) { +if (qcow2_opts->has_backing_fmt && !qcow2_opts->backing_file) {error_setg (errp,"Backing format cannot be used without backing file" ); ret = -EINVAL ; goto out;
@@ -3558,7 +3558,7 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp) ret = -EINVAL ; goto out; } -if (qcow2_opts->data_file_raw && qcow2_opts->has_backing_file) { +if (qcow2_opts->data_file_raw && qcow2_opts->backing_file) {error_setg (errp,"Backing file and data-file-raw cannot be used at " "the same time" ); ret = -EINVAL ;
@@ -3584,7 +3584,7 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)* backing file when specifying data_file_raw is an error * anyway. */ -assert (!qcow2_opts->has_backing_file); +assert (!qcow2_opts->backing_file); }if (qcow2_opts->data_file) {
@@ -3752,7 +3752,7 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp) }/* Want a backing file? There you go. */ -if (qcow2_opts->has_backing_file) { +if (qcow2_opts->backing_file) {const char *backing_format =NULL ;if (qcow2_opts->has_backing_fmt) {
@@ -3770,7 +3770,7 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp) }/* Want encryption? There you go. */ -if (qcow2_opts->has_encrypt) { +if (qcow2_opts->encrypt) { ret =qcow2_set_up_encryption (blk_bs (blk), qcow2_opts->encrypt, errp);if (ret <0 ) { goto out;
@@ -5195,7 +5195,6 @@ static ImageInfoSpecific *qcow2_get_specific_info(BlockDriverState *bs, .refcount_bits = s->refcount_bits, .has_bitmaps = !!bitmaps, .bitmaps = bitmaps, - .has_data_file = !!s->image_data_file, .data_file = g_strdup(s->image_data_file), .has_data_file_raw = has_data_file(bs), .data_file_raw = data_file_is_raw(bs),
@@ -5226,7 +5225,6 @@ static ImageInfoSpecific *qcow2_get_specific_info(BlockDriverState *bs,memset (&encrypt_info->u,0 ,sizeof (encrypt_info->u));qapi_free_QCryptoBlockInfo (encrypt_info); - spec_info->u.qcow2.data->has_encrypt = true; spec_info->u.qcow2.data->encrypt = qencrypt; }
@@ -5846,7 +5844,7 @@ static int coroutine_fn qcow2_co_amend(BlockDriverState *bs,BDRVQcow2State *s = bs->opaque;int ret =0 ; -if (qopts->has_encrypt) { +if (qopts->encrypt) {if (!s->crypto) {error_setg (errp,"image is not encrypted, can't amend" );return -EOPNOTSUPP ;
@@ -5911,7 +5909,7 @@ void qcow2_signal_corruption(BlockDriverState *bs, bool fatal, int64_t offset, node_name =bdrv_get_node_name (bs);qapi_event_send_block_image_corrupted (bdrv_get_device_name (bs), - *node_name !='\0' , node_name, + *node_name ? node_name :NULL , message, offset >=0 , offset, size >=0 , size, fatal);
block/qed.c +1 -1
@@ -698,7 +698,7 @@ static int coroutine_fn bdrv_qed_co_create(BlockdevCreateOptions *opts, goto out; } -if (qed_opts->has_backing_file) { +if (qed_opts->backing_file) { header.features |=QED_F_BACKING_FILE ; header.backing_filename_offset =sizeof (le_header); header.backing_filename_size =strlen (qed_opts->backing_file);
block/quorum.c +1 -1
@@ -202,7 +202,7 @@ static void quorum_report_bad(QuorumOpType type, uint64_t offset, msg =strerror (-ret); } -qapi_event_send_quorum_report_bad (type, !!msg, msg, node_name, start_sector, +qapi_event_send_quorum_report_bad (type, msg, node_name, start_sector, end_sector - start_sector); }
block/rbd.c +5 -10
@@ -536,7 +536,7 @@ static int qemu_rbd_do_create(BlockdevCreateOptions *options,int ret;assert (options->driver ==BLOCKDEV_DRIVER_RBD ); -if (opts->location->has_snapshot) { +if (opts->location->snapshot) {error_setg (errp,"Can't use snapshot name for image creation" );return -EINVAL ; }
@@ -574,7 +574,7 @@ static int qemu_rbd_do_create(BlockdevCreateOptions *options, }#ifdef LIBRBD_SUPPORTS_ENCRYPTION -if (opts->has_encrypt) { +if (opts->encrypt) {rbd_image_t image; ret =rbd_open (io_ctx, opts->location->image, &image,NULL );
@@ -686,7 +686,6 @@ static int coroutine_fn qemu_rbd_co_create_opts(BlockDriver *drv, goto exit; } rbd_opts->encrypt = encrypt; - rbd_opts->has_encrypt = !!encrypt;/* * Caution: while qdict_get_try_str() is fine, getting non-string
@@ -697,11 +696,8 @@ static int coroutine_fn qemu_rbd_co_create_opts(BlockDriver *drv, loc = rbd_opts->location; loc->pool =g_strdup (qdict_get_try_str (options,"pool" )); loc->conf =g_strdup (qdict_get_try_str (options,"conf" )); - loc->has_conf = !!loc->conf; loc->user =g_strdup (qdict_get_try_str (options,"user" )); - loc->has_user = !!loc->user; loc->q_namespace =g_strdup (qdict_get_try_str (options,"namespace" )); - loc->has_q_namespace = !!loc->q_namespace; loc->image =g_strdup (qdict_get_try_str (options,"image" )); keypairs =qdict_get_try_str (options,"=keyvalue-pairs" );
@@ -767,7 +763,6 @@ static int qemu_rbd_connect(rados_t *cluster, rados_ioctx_t *io_ctx,return -EINVAL ; } opts->key_secret =g_strdup (secretid); - opts->has_key_secret = true; } mon_host =qemu_rbd_mon_host (opts, &local_err);
@@ -785,7 +780,7 @@ static int qemu_rbd_connect(rados_t *cluster, rados_ioctx_t *io_ctx,/* try default location when conf=NULL, but ignore failure */ r =rados_conf_read_file (*cluster, opts->conf); -if (opts->has_conf && r <0 ) { +if (opts->conf && r <0 ) {error_setg_errno (errp, -r,"error reading conf file %s" , opts->conf); goto failed_shutdown; }
@@ -833,7 +828,7 @@ static int qemu_rbd_connect(rados_t *cluster, rados_ioctx_t *io_ctx, }#ifdef HAVE_RBD_NAMESPACE_EXISTS -if (opts->has_q_namespace &&strlen (opts->q_namespace) >0 ) { +if (opts->q_namespace &&strlen (opts->q_namespace) >0 ) {bool exists; r =rbd_namespace_exists (*io_ctx, opts->q_namespace, &exists);
@@ -991,7 +986,7 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags, goto failed_open; } -if (opts->has_encrypt) { +if (opts->encrypt) {#ifdef LIBRBD_SUPPORTS_ENCRYPTION r =qemu_rbd_encryption_load (s->image, opts->encrypt, errp);if (r <0 ) {
block/ssh.c +1 -1
@@ -643,7 +643,7 @@ static int connect_to_ssh(BDRVSSHState *s, BlockdevOptionsSsh *opts,unsigned int port =0 ;int new_sock =-1 ; -if (opts->has_user) { +if (opts->user) { s->user =g_strdup (opts->user); }else { s->user =g_strdup (g_get_user_name ());
blockdev-nbd.c +4 -5
@@ -173,8 +173,8 @@ void nbd_server_start_options(NbdServerOptions *arg, Error **errp) }void qmp_nbd_server_start (SocketAddressLegacy *addr, -bool has_tls_creds,const char *tls_creds, -bool has_tls_authz,const char *tls_authz, +const char *tls_creds, +const char *tls_authz,bool has_max_connections,uint32_t max_connections,Error **errp) {
@@ -200,8 +200,7 @@ void qmp_nbd_server_add(NbdServerAddOptions *arg, Error **errp)* block-export-add would default to the node-name, but we may have to use * the device name as a default here for compatibility. */ -if (!arg->has_name) { - arg->has_name = true; +if (!arg->name) { arg->name =g_strdup (arg->device); }
@@ -215,7 +214,7 @@ void qmp_nbd_server_add(NbdServerAddOptions *arg, Error **errp) };QAPI_CLONE_MEMBERS (BlockExportOptionsNbdBase, &export_opts->u.nbd,qapi_NbdServerAddOptions_base (arg)); -if (arg->has_bitmap) { +if (arg->bitmap) {BlockDirtyBitmapOrStr *el =g_new (BlockDirtyBitmapOrStr,1 ); *el = (BlockDirtyBitmapOrStr ) {
blockdev.c +65 -99
482 lines not on this page · raw message
blockjob.c +0 -2
@@ -353,7 +353,6 @@ BlockJobInfo *block_job_query_locked(BlockJob *job, Error **errp) info->auto_finalize = job->job.auto_finalize; info->auto_dismiss = job->job.auto_dismiss;if (job->job.ret) { - info->has_error = true; info->error = job->job.err ?g_strdup (error_get_pretty (job->job.err)) :g_strdup (strerror (-job->job.ret));
@@ -413,7 +412,6 @@ static void block_job_event_completed_locked(Notifier *n, void *opaque) progress_total, progress_current, job->speed, - !!msg, msg); }
monitor/hmp-cmds.c +1 -2
@@ -1496,8 +1496,7 @@ void hmp_change(Monitor *mon, const QDict *qdict) } } -qmp_blockdev_change_medium (true, device, false,NULL , target, - !!arg, arg, true, force, +qmp_blockdev_change_medium (device,NULL , target, arg, true, force, !!read_only, read_only_mode, &err); }
qemu-img.c +6 -7
@@ -2915,15 +2915,15 @@ static ImageInfoList *collect_image_info_list(bool image_opts, image_opts = false;if (chain) { -if (info->has_full_backing_filename) { +if (info->full_backing_filename) { filename = info->full_backing_filename; - }else if (info->has_backing_filename) { + }else if (info->backing_filename) {error_report ("Could not determine absolute backing filename," " but backing filename '%s' present" , info->backing_filename); goto err; } -if (info->has_backing_filename_format) { +if (info->backing_filename_format) { fmt = info->backing_filename_format; } }
@@ -3046,7 +3046,7 @@ static int dump_map_entry(OutputFormat output_format, MapEntry *e,printf ("%#-16" PRIx64"%#-16" PRIx64"%#-16" PRIx64"%s\n" , e->start, e->length, e->has_offset ? e->offset :0 , - e->has_filename ? e->filename :"" ); + e->filename ?:"" ); }/* This format ignores the distinction between 0, ZERO and ZERO|DATA. * Modify the flags here to allow more coalescing.
@@ -3127,7 +3127,6 @@ static int get_block_status(BlockDriverState *bs, int64_t offset, .has_offset = has_offset, .depth = depth, .present = !!(ret & BDRV_BLOCK_ALLOCATED), - .has_filename = filename, .filename = filename, };
@@ -3143,11 +3142,11 @@ static inline bool entry_mergeable(const MapEntry *curr, const MapEntry *next) curr->data != next->data || curr->depth != next->depth || curr->present != next->present || - curr->has_filename != next->has_filename || + !curr->filename != !next->filename || curr->has_offset != next->has_offset) { return false; } -if (curr->has_filename &&strcmp (curr->filename, next->filename)) { +if (curr->filename &&strcmp (curr->filename, next->filename)) {return false; }if (curr->has_offset && curr->offset + curr->length != next->offset) {
qemu-nbd.c +0 -2
@@ -1107,9 +1107,7 @@ int main(int argc, char **argv) .has_writable = true, .writable = !readonly, .u.nbd = { - .has_name = true, .name = g_strdup(export_name), - .has_description = !!export_description, .description = g_strdup(export_description), .has_bitmaps = !!bitmaps, .bitmaps = bitmaps,
scripts/qapi/schema.py +0 -3
@@ -759,9 +759,6 @@ def need_has(self): assert self.type # Temporary hack to support dropping the has_FOO in reviewable chunks opt_out = [ - 'qapi/block-core.json', - 'qapi/block-export.json', - 'qapi/block.json', 'qapi/char.json', 'qapi/crypto.json', 'qapi/dump.json',
Signature · 1 line
2.37.3
PATCH v3 11/30 qapi chardev: Elide redundant has_FOO in generated C
In reply to Markus ArmbrusterThe has_FOO for pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundant has_FOO in generated C" provided the means to elide them step by step. This is the step for qapi/char.json.
Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here.
--- chardev/char-file.c | 4 ++-- chardev/char-socket.c | 10 ++++------ chardev/char-udp.c | 1 - chardev/char.c | 6 +----- tests/unit/test-char.c | 1 - scripts/qapi/schema.py | 1 - 6 files changed, 7 insertions(+), 16 deletions(-)
chardev/char-file.c +2 -2
@@ -45,7 +45,7 @@ static void qmp_chardev_open_file(Chardev *chr,DWORD accessmode;DWORD flags; -if (file->has_in) { +if (file->in) {error_setg (errp,"input file not supported" );return ; }
@@ -83,7 +83,7 @@ static void qmp_chardev_open_file(Chardev *chr,return ; } -if (file->has_in) { +if (file->in) { flags =O_RDONLY ; in =qmp_chardev_open_file_source (file->in, flags, errp);if (in <0 ) {
chardev/char-socket.c +4 -6
@@ -1251,7 +1251,7 @@ static bool qmp_chardev_validate_socket(ChardevSocket *sock, "'fd' address type");return false; } -if (sock->has_tls_creds && +if (sock->tls_creds && !(sock->has_server && sock->server)) {error_setg (errp, "'tls_creds' option is incompatible with "
@@ -1261,7 +1261,7 @@ static bool qmp_chardev_validate_socket(ChardevSocket *sock,break ;case SOCKET_ADDRESS_TYPE_UNIX : -if (sock->has_tls_creds) { +if (sock->tls_creds) {error_setg (errp,"'tls_creds' option is incompatible with " "'unix' address type" );
@@ -1273,7 +1273,7 @@ static bool qmp_chardev_validate_socket(ChardevSocket *sock,break ;case SOCKET_ADDRESS_TYPE_VSOCK : -if (sock->has_tls_creds) { +if (sock->tls_creds) {error_setg (errp,"'tls_creds' option is incompatible with " "'vsock' address type" );
@@ -1284,7 +1284,7 @@ static bool qmp_chardev_validate_socket(ChardevSocket *sock,break ; } -if (sock->has_tls_authz && !sock->has_tls_creds) { +if (sock->tls_authz && !sock->tls_creds) {error_setg (errp,"'tls_authz' option requires 'tls_creds' option" );return false; }
@@ -1465,9 +1465,7 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, sock->wait =qemu_opt_get_bool (opts,"wait" , true); sock->has_reconnect =qemu_opt_find (opts,"reconnect" ); sock->reconnect =qemu_opt_get_number (opts,"reconnect" ,0 ); - sock->has_tls_creds =qemu_opt_get (opts,"tls-creds" ); sock->tls_creds =g_strdup (qemu_opt_get (opts,"tls-creds" )); - sock->has_tls_authz =qemu_opt_get (opts,"tls-authz" ); sock->tls_authz =g_strdup (qemu_opt_get (opts,"tls-authz" )); addr =g_new0 (SocketAddressLegacy,1 );
chardev/char-udp.c +0 -1
@@ -178,7 +178,6 @@ static void qemu_chr_parse_udp(QemuOpts *opts, ChardevBackend *backend, udp->remote = addr;if (has_local) { - udp->has_local = true; addr =g_new0 (SocketAddressLegacy,1 ); addr->type =SOCKET_ADDRESS_TYPE_INET ; addr->u.inet.data =g_new (InetSocketAddress,1 );
chardev/char.c +1 -5
@@ -240,7 +240,7 @@ static void qemu_char_open(Chardev *chr, ChardevBackend *backend,/* Any ChardevCommon member would work */ ChardevCommon *common = backend ? backend->u.null.data :NULL ; -if (common && common->has_logfile) { +if (common && common->logfile) {int flags =O_WRONLY ;if (common->has_logappend && common->logappend) {
@@ -496,9 +496,7 @@ void qemu_chr_parse_common(QemuOpts *opts, ChardevCommon *backend) {const char *logfile =qemu_opt_get (opts,"logfile" ); - backend->has_logfile = logfile !=NULL ; backend->logfile =g_strdup (logfile); - backend->has_logappend = true; backend->logappend =qemu_opt_get_bool (opts,"logappend" , false); }
@@ -1057,7 +1055,6 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, ret =g_new0 (ChardevReturn,1 );if (CHARDEV_IS_PTY (chr)) { ret->pty =g_strdup (chr->filename +4 ); - ret->has_pty = true; }return ret;
@@ -1160,7 +1157,6 @@ ChardevReturn *qmp_chardev_change(const char *id, ChardevBackend *backend, ret =g_new0 (ChardevReturn,1 );if (CHARDEV_IS_PTY (chr_new)) { ret->pty =g_strdup (chr_new->filename +4 ); - ret->has_pty = true; }return ret;
tests/unit/test-char.c +0 -1
@@ -1212,7 +1212,6 @@ static void char_file_fifo_test(void)char *fifo =g_build_filename (tmp_path,"fifo" ,NULL );char *out =g_build_filename (tmp_path,"out" ,NULL );ChardevFile file = { .in = fifo, - .has_in = true, .out = out };ChardevBackend backend = { .type =CHARDEV_BACKEND_KIND_FILE , .u.file.data = &file };
scripts/qapi/schema.py +0 -1
@@ -759,7 +759,6 @@ def need_has(self): assert self.type # Temporary hack to support dropping the has_FOO in reviewable chunks opt_out = [ - 'qapi/char.json', 'qapi/crypto.json', 'qapi/dump.json', 'qapi/job.json',
Signature · 1 line
2.37.3
PATCH v3 12/30 qapi crypto: Elide redundant has_FOO in generated C
In reply to Markus ArmbrusterThe has_FOO for pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundant has_FOO in generated C" provided the means to elide them step by step. This is the step for qapi/crypto.json.
Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here.
--- crypto/block-luks.c | 16 ++++++++-------- tests/unit/test-crypto-block.c | 6 ------ scripts/qapi/schema.py | 1 - 3 files changed, 8 insertions(+), 15 deletions(-)
crypto/block-luks.c +8 -8
@@ -1597,13 +1597,13 @@ qcrypto_block_luks_amend_add_keyslot(QCryptoBlock *block, g_autofree char *new_password = NULL; g_autofree uint8_t *master_key = NULL; -char *secret = opts_luks->has_secret ? opts_luks->secret : luks->secret; +char *secret = opts_luks->secret ?: luks->secret; -if (!opts_luks->has_new_secret) { +if (!opts_luks->new_secret) {error_setg (errp,"'new-secret' is required to activate a keyslot" );return -1 ; } -if (opts_luks->has_old_secret) { +if (opts_luks->old_secret) {error_setg (errp,"'old-secret' must not be given when activating keyslots" );return -1 ;
@@ -1677,7 +1677,7 @@ qcrypto_block_luks_amend_erase_keyslots(QCryptoBlock *block, g_autofree uint8_t *tmpkey = NULL; g_autofree char *old_password = NULL; -if (opts_luks->has_new_secret) { +if (opts_luks->new_secret) {error_setg (errp,"'new-secret' must not be given when erasing keyslots" );return -1 ;
@@ -1687,14 +1687,14 @@ qcrypto_block_luks_amend_erase_keyslots(QCryptoBlock *block, "'iter-time' must not be given when erasing keyslots");return -1 ; } -if (opts_luks->has_secret) { +if (opts_luks->secret) {error_setg (errp,"'secret' must not be given when erasing keyslots" );return -1 ; }/* Load the old password if given */ -if (opts_luks->has_old_secret) { +if (opts_luks->old_secret) { old_password =qcrypto_secret_lookup_as_utf8 (opts_luks->old_secret, errp);if (!old_password) {
@@ -1719,7 +1719,7 @@ qcrypto_block_luks_amend_erase_keyslots(QCryptoBlock *block,return -1 ; } -if (opts_luks->has_old_secret) { +if (opts_luks->old_secret) { int rv = qcrypto_block_luks_load_key(block, keyslot, old_password,
@@ -1761,7 +1761,7 @@ qcrypto_block_luks_amend_erase_keyslots(QCryptoBlock *block, }/* Erase all keyslots that match the given old password */ - }else if (opts_luks->has_old_secret) { + }else if (opts_luks->old_secret) {unsigned long slots_to_erase_bitmap =0 ;size_t i;
tests/unit/test-crypto-block.c +0 -6
@@ -41,7 +41,6 @@static QCryptoBlockCreateOptions qcow_create_opts = { .format =Q_CRYPTO_BLOCK_FORMAT_QCOW , .u.qcow = { - .has_key_secret = true, .key_secret = (char *)"sec0" , }, };
@@ -49,7 +48,6 @@ static QCryptoBlockCreateOptions qcow_create_opts = {static QCryptoBlockOpenOptions qcow_open_opts = { .format =Q_CRYPTO_BLOCK_FORMAT_QCOW , .u.qcow = { - .has_key_secret = true, .key_secret = (char *)"sec0" , }, };
@@ -59,7 +57,6 @@ static QCryptoBlockOpenOptions qcow_open_opts = {static QCryptoBlockOpenOptions luks_open_opts = { .format =Q_CRYPTO_BLOCK_FORMAT_LUKS , .u.luks = { - .has_key_secret = true, .key_secret = (char *)"sec0" , }, };
@@ -69,7 +66,6 @@ static QCryptoBlockOpenOptions luks_open_opts = {static QCryptoBlockCreateOptions luks_create_opts_default = { .format =Q_CRYPTO_BLOCK_FORMAT_LUKS , .u.luks = { - .has_key_secret = true, .key_secret = (char *)"sec0" , }, };
@@ -79,7 +75,6 @@ static QCryptoBlockCreateOptions luks_create_opts_default = {static QCryptoBlockCreateOptions luks_create_opts_aes256_cbc_plain64 = { .format =Q_CRYPTO_BLOCK_FORMAT_LUKS , .u.luks = { - .has_key_secret = true, .key_secret = (char *)"sec0" , .has_cipher_alg = true, .cipher_alg =QCRYPTO_CIPHER_ALG_AES_256 ,
@@ -94,7 +89,6 @@ static QCryptoBlockCreateOptions luks_create_opts_aes256_cbc_plain64 = {static QCryptoBlockCreateOptions luks_create_opts_aes256_cbc_essiv = { .format =Q_CRYPTO_BLOCK_FORMAT_LUKS , .u.luks = { - .has_key_secret = true, .key_secret = (char *)"sec0" , .has_cipher_alg = true, .cipher_alg =QCRYPTO_CIPHER_ALG_AES_256 ,
scripts/qapi/schema.py +0 -1
@@ -759,7 +759,6 @@ def need_has(self): assert self.type # Temporary hack to support dropping the has_FOO in reviewable chunks opt_out = [ - 'qapi/crypto.json', 'qapi/dump.json', 'qapi/job.json', 'qapi/machine.json',
Signature · 1 line
2.37.3
PATCH v3 13/30 qapi dump: Elide redundant has_FOO in generated C
In reply to Markus ArmbrusterThe has_FOO for pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundant has_FOO in generated C" provided the means to elide them step by step. This is the step for qapi/dump.json.
Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here.
--- dump/dump.c | 4 ++-- scripts/qapi/schema.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-)
dump/dump.c +2 -2
@@ -2044,8 +2044,8 @@ static void dump_process(DumpState *s, Error **errp) result =qmp_query_dump (NULL );/* should never fail */ assert (result); -qapi_event_send_dump_completed (result, !!*errp, (*errp ? -error_get_pretty (*errp) :NULL )); +qapi_event_send_dump_completed (result, + *errp ?error_get_pretty (*errp) :NULL );qapi_free_DumpQueryResult (result);dump_cleanup (s);
scripts/qapi/schema.py +0 -1
@@ -759,7 +759,6 @@ def need_has(self): assert self.type # Temporary hack to support dropping the has_FOO in reviewable chunks opt_out = [ - 'qapi/dump.json', 'qapi/job.json', 'qapi/machine.json', 'qapi/machine-target.json',
Signature · 1 line
2.37.3
Re: [PATCH v3 13/30] qapi dump: Elide redundant has_FOO in generated C
Quoted 8 lines · Markus Armbruster
The
has_FOOfor pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundanthas_FOOin generated C" provided the means to elide them step by step. This is the step forqapi/dump.json.Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here.
Quoted 6 lines
Cc Marc-André Lureau <[email protected]>Signed-off-by Markus Armbruster <[email protected]>--- dump/dump.c | 4 ++-- scripts/qapi/schema.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-)
PATCH v3 14/30 qapi job: Elide redundant has_FOO in generated C
In reply to Markus ArmbrusterThe has_FOO for pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundant has_FOO in generated C" provided the means to elide them step by step. This is the step for qapi/job.json.
Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here.
--- job-qmp.c | 3 +-- scripts/qapi/schema.py | 1 - 2 files changed, 1 insertion(+), 3 deletions(-)
job-qmp.c +1 -2
@@ -156,8 +156,7 @@ static JobInfo *job_query_single_locked(Job *job, Error **errp) .status = job->status, .current_progress = progress_current, .total_progress = progress_total, - .has_error = !!job->err, - .error = job->err ? \ + .error = job->err ? g_strdup(error_get_pretty(job->err)) : NULL, };
scripts/qapi/schema.py +0 -1
@@ -759,7 +759,6 @@ def need_has(self): assert self.type # Temporary hack to support dropping the has_FOO in reviewable chunks opt_out = [ - 'qapi/job.json', 'qapi/machine.json', 'qapi/machine-target.json', 'qapi/migration.json',
Signature · 1 line
2.37.3
PATCH v3 15/30 qapi machine: Elide redundant has_FOO in generated C
In reply to Markus ArmbrusterThe has_FOO for pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundant has_FOO in generated C" provided the means to elide them step by step. This is the step for qapi/machine*.json.
Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here.
--- hw/core/machine-hmp-cmds.c | 2 +- hw/core/machine-qmp-cmds.c | 9 ++------- hw/core/machine.c | 10 ++++------ hw/core/numa.c | 8 ++++---- hw/mem/pc-dimm.c | 1 - hw/nvram/fw_cfg.c | 2 +- hw/virtio/virtio-mem-pci.c | 4 +--- hw/virtio/virtio-pmem-pci.c | 1 - target/arm/monitor.c | 1 - target/i386/cpu-sysemu.c | 7 ++----- target/i386/cpu.c | 1 - target/s390x/cpu_models_sysemu.c | 1 - scripts/qapi/schema.py | 2 -- 13 files changed, 15 insertions(+), 34 deletions(-)
hw/core/machine-hmp-cmds.c +1 -1
@@ -62,7 +62,7 @@ void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict)monitor_printf (mon," type: \"%s\"\n" , l->value->type);monitor_printf (mon," vcpus_count: \"%" PRIu64"\"\n" , l->value->vcpus_count); -if (l->value->has_qom_path) { +if (l->value->qom_path) {monitor_printf (mon," qom_path: \"%s\"\n" , l->value->qom_path); }
hw/core/machine-qmp-cmds.c +2 -7
@@ -55,8 +55,7 @@ CpuInfoFastList *qmp_query_cpus_fast(Error **errp) value->qom_path =object_get_canonical_path (OBJECT (cpu)); value->thread_id = cpu->thread_id; - value->has_props = !!mc->cpu_index_to_instance_props; -if (value->has_props) { +if (mc->cpu_index_to_instance_props) {CpuInstanceProperties *props; props =g_malloc0 (sizeof (*props)); *props = mc->cpu_index_to_instance_props (ms, cpu->cpu_index);
@@ -90,7 +89,6 @@ MachineInfoList *qmp_query_machines(Error **errp) }if (mc->alias) { - info->has_alias = true; info->alias =g_strdup (mc->alias); }
@@ -101,11 +99,9 @@ MachineInfoList *qmp_query_machines(Error **errp) info->deprecated = !!mc->deprecation_reason;if (mc->default_cpu_type) { info->default_cpu_type =g_strdup (mc->default_cpu_type); - info->has_default_cpu_type = true; }if (mc->default_ram_id) { info->default_ram_id =g_strdup (mc->default_ram_id); - info->has_default_ram_id = true; }QAPI_LIST_PREPEND (mach_list, info);
@@ -168,7 +164,6 @@ static int query_memdev(Object *obj, void *opaque) m =g_malloc0 (sizeof (*m)); m->id =g_strdup (object_get_canonical_path_component (obj)); - m->has_id = !!m->id; m->size =object_property_get_uint (obj,"size" , &error_abort); m->merge =object_property_get_bool (obj,"merge" , &error_abort);
@@ -227,7 +222,7 @@ HumanReadableText *qmp_x_query_numa(Error **errp)for (i =0 ; i < nb_numa_nodes; i++) {g_string_append_printf (buf,"node %d cpus:" , i);for (cpu = cpu_list; cpu; cpu = cpu->next) { -if (cpu->value->has_props && cpu->value->props->has_node_id && +if (cpu->value->props && cpu->value->props->has_node_id && cpu->value->props->node_id == i) {g_string_append_printf (buf," %" PRIi64, cpu->value->cpu_index); }
hw/core/machine.c +4 -6
@@ -682,7 +682,6 @@ HotpluggableCPUList *machine_query_hotpluggable_cpus(MachineState *machine) cpu = machine->possible_cpus->cpus[i].cpu;if (cpu) { - cpu_item->has_qom_path = true; cpu_item->qom_path =object_get_canonical_path (cpu); }QAPI_LIST_PREPEND (head, cpu_item);
@@ -871,8 +870,7 @@ static void machine_copy_boot_config(MachineState *ms, BootConfiguration *configmachine_free_boot_config (ms); ms->boot_config = *config; -if (!config->has_order) { - ms->boot_config.has_order = true; +if (!config->order) { ms->boot_config.order =g_strdup (machine_class->default_boot_order); } }
@@ -887,13 +885,13 @@ static void machine_set_boot(Object *obj, Visitor *v, const char *name,if (!visit_type_BootConfiguration (v, name, &config, errp)) {return ; } -if (config->has_order) { +if (config->order) {validate_bootdevices (config->order, errp);if (*errp) { goto out_free; } } -if (config->has_once) { +if (config->once) {validate_bootdevices (config->once, errp);if (*errp) { goto out_free;
@@ -1424,7 +1422,7 @@ void qdev_machine_creation_done(void) {cpu_synchronize_all_post_init (); -if (current_machine->boot_config.has_once) { +if (current_machine->boot_config.once) {qemu_boot_set (current_machine->boot_config.once, &error_fatal);qemu_register_reset (restore_boot_order,g_strdup (current_machine->boot_config.order)); }
hw/core/numa.c +4 -4
@@ -130,9 +130,9 @@ static void parse_numa_node(MachineState *ms, NumaNodeOptions *node, } } - have_memdevs = have_memdevs ? : node->has_memdev; - have_mem = have_mem ? : node->has_mem; -if ((node->has_mem && have_memdevs) || (node->has_memdev && have_mem)) { + have_memdevs = have_memdevs || node->memdev; + have_mem = have_mem || node->has_mem; +if ((node->has_mem && have_memdevs) || (node->memdev && have_mem)) {error_setg (errp,"numa configuration should use either mem= or memdev=," "mixing both is not allowed" );return ;
@@ -152,7 +152,7 @@ static void parse_numa_node(MachineState *ms, NumaNodeOptions *node, " use -numa node,memdev instead"); } } -if (node->has_memdev) { +if (node->memdev) {Object *o; o =object_resolve_path_type (node->memdev,TYPE_MEMORY_BACKEND ,NULL );if (!o) {
hw/mem/pc-dimm.c +0 -1
@@ -252,7 +252,6 @@ static void pc_dimm_md_fill_device_info(const MemoryDeviceState *md,const DeviceState *dev =DEVICE (md);if (dev->id) { - di->has_id = true; di->id =g_strdup (dev->id); } di->hotplugged = dev->hotplugged;
hw/nvram/fw_cfg.c +1 -1
@@ -201,7 +201,7 @@ static void fw_cfg_bootsplash(FWCfgState *s) }/* insert splash file if user configurated */ -if (current_machine->boot_config.has_splash) { +if (current_machine->boot_config.splash) {const char *boot_splash_filename = current_machine->boot_config.splash; filename =qemu_find_file (QEMU_FILE_TYPE_BIOS , boot_splash_filename);if (filename ==NULL ) {
hw/virtio/virtio-mem-pci.c +1 -3
@@ -65,7 +65,6 @@ static void virtio_mem_pci_fill_device_info(const MemoryDeviceState *md,DeviceState *dev =DEVICE (md);if (dev->id) { - vi->has_id = true; vi->id =g_strdup (dev->id); }
@@ -90,8 +89,7 @@ static void virtio_mem_pci_size_change_notify(Notifier *notifier, void *data)char *qom_path =object_get_canonical_path (OBJECT (dev));const uint64_t *const size_p = data; -qapi_event_send_memory_device_size_change (!!dev->id, dev->id, *size_p, - qom_path); +qapi_event_send_memory_device_size_change (dev->id, *size_p, qom_path);g_free (qom_path); }
hw/virtio/virtio-pmem-pci.c +0 -1
@@ -70,7 +70,6 @@ static void virtio_pmem_pci_fill_device_info(const MemoryDeviceState *md,DeviceState *dev =DEVICE (md);if (dev->id) { - vi->has_id = true; vi->id =g_strdup (dev->id); }
target/arm/monitor.c +0 -1
@@ -221,7 +221,6 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type,qobject_unref (qdict_out); }else { expansion_info->model->props =QOBJECT (qdict_out); - expansion_info->model->has_props = true; }object_unref (obj);
target/i386/cpu-sysemu.c +2 -5
@@ -187,10 +187,8 @@ qmp_query_cpu_model_expansion(CpuModelExpansionType type,QDict *props =NULL ;const char *base_name; - xc =x86_cpu_from_model (model->name, - model->has_props ? -qobject_to (QDict, model->props) : -NULL , &err); + xc =x86_cpu_from_model (model->name,qobject_to (QDict, model->props), + &err);if (err) { goto out; }
@@ -198,7 +196,6 @@ qmp_query_cpu_model_expansion(CpuModelExpansionType type, props =qdict_new (); ret->model =g_new0 (CpuModelInfo,1 ); ret->model->props =QOBJECT (props); - ret->model->has_props = true;switch (type) {case CPU_MODEL_EXPANSION_TYPE_STATIC :
target/i386/cpu.c +0 -1
@@ -4901,7 +4901,6 @@ static void x86_cpu_definition_entry(gpointer data, gpointer user_data)*/ if (default_cpu_version !=CPU_VERSION_LEGACY ) { info->alias_of =x86_cpu_class_get_alias_of (cc); - info->has_alias_of = !!info->alias_of; }QAPI_LIST_PREPEND (*cpu_list, info);
target/s390x/cpu_models_sysemu.c +0 -1
@@ -210,7 +210,6 @@ static void cpu_info_from_model(CpuModelInfo *info, const S390CPUModel *model,qobject_unref (qdict); }else { info->props =QOBJECT (qdict); - info->has_props = true; } }
scripts/qapi/schema.py +0 -2
@@ -759,8 +759,6 @@ def need_has(self): assert self.type # Temporary hack to support dropping the has_FOO in reviewable chunks opt_out = [ - 'qapi/machine.json', - 'qapi/machine-target.json', 'qapi/migration.json', 'qapi/misc.json', 'qapi/net.json',
Signature · 1 line
2.37.3
PATCH v3 16/30 qapi migration: Elide redundant has_FOO in generated C
In reply to Markus ArmbrusterThe has_FOO for pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundant has_FOO in generated C" provided the means to elide them step by step. This is the step for qapi/migration.json.
Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here.
--- migration/block-dirty-bitmap.c | 4 ++-- migration/colo.c | 1 - migration/migration.c | 27 ++++++++------------------- monitor/hmp-cmds.c | 26 +++++++++++--------------- monitor/misc.c | 2 +- scripts/qapi/schema.py | 1 - 6 files changed, 22 insertions(+), 39 deletions(-)
migration/block-dirty-bitmap.c +2 -2
@@ -551,7 +551,7 @@ static int add_bitmaps_to_list(DBMSaveState *s, BlockDriverState *bs, } bitmap_alias = bmap_inner->alias; -if (bmap_inner->has_transform) { +if (bmap_inner->transform) { bitmap_transform = bmap_inner->transform; } }else {
@@ -821,7 +821,7 @@ static int dirty_bitmap_load_start(QEMUFile *f, DBMLoadState *s) }if (s->bmap_inner && - s->bmap_inner->has_transform && + s->bmap_inner->transform && s->bmap_inner->transform->has_persistent) { persistent = s->bmap_inner->transform->persistent; }else {
migration/colo.c +0 -1
@@ -250,7 +250,6 @@ ReplicationStatus *qmp_query_xen_replication_status(Error **errp)replication_get_error_all (&err);if (err) { s->error = true; - s->has_desc = true; s->desc =g_strdup (error_get_pretty (err)); }else { s->error = false;
migration/migration.c +8 -19
@@ -918,11 +918,8 @@ MigrationParameters *qmp_query_migrate_parameters(Error **errp) params->cpu_throttle_increment = s->parameters.cpu_throttle_increment; params->has_cpu_throttle_tailslow = true; params->cpu_throttle_tailslow = s->parameters.cpu_throttle_tailslow; - params->has_tls_creds = true; params->tls_creds =g_strdup (s->parameters.tls_creds); - params->has_tls_hostname = true; params->tls_hostname =g_strdup (s->parameters.tls_hostname); - params->has_tls_authz = true; params->tls_authz =g_strdup (s->parameters.tls_authz ? s->parameters.tls_authz :"" ); params->has_max_bandwidth = true;
@@ -1047,7 +1044,6 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s) {size_t page_size =qemu_target_page_size (); - info->has_ram = true; info->ram =g_malloc0 (sizeof (*info->ram)); info->ram->transferred = ram_counters.transferred; info->ram->total =ram_bytes_total ();
@@ -1069,7 +1065,6 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s) info->ram->postcopy_bytes = ram_counters.postcopy_bytes;if (migrate_use_xbzrle ()) { - info->has_xbzrle_cache = true; info->xbzrle_cache =g_malloc0 (sizeof (*info->xbzrle_cache)); info->xbzrle_cache->cache_size =migrate_xbzrle_cache_size (); info->xbzrle_cache->bytes = xbzrle_counters.bytes;
@@ -1081,7 +1076,6 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s) }if (migrate_use_compression ()) { - info->has_compression = true; info->compression =g_malloc0 (sizeof (*info->compression)); info->compression->pages = compression_counters.pages; info->compression->busy = compression_counters.busy;
@@ -1106,7 +1100,6 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s)static void populate_disk_info (MigrationInfo *info) {if (blk_mig_active ()) { - info->has_disk = true; info->disk =g_malloc0 (sizeof (*info->disk)); info->disk->transferred =blk_mig_bytes_transferred (); info->disk->remaining =blk_mig_bytes_remaining ();
@@ -1171,7 +1164,6 @@ static void fill_source_migration_info(MigrationInfo *info)case MIGRATION_STATUS_FAILED : info->has_status = true;if (s->error) { - info->has_error_desc = true; info->error_desc =g_strdup (error_get_pretty (s->error)); }break ;
@@ -1557,7 +1549,7 @@ static bool migrate_params_check(MigrationParameters *params, Error **errp)#ifdef CONFIG_LINUX if (migrate_use_zero_copy_send () && ((params->has_multifd_compression && params->multifd_compression) || - (params->has_tls_creds && params->tls_creds && *params->tls_creds))) { + (params->tls_creds && *params->tls_creds))) {error_setg (errp,"Zero copy only available for non-compressed non-TLS multifd migration" );return false;
@@ -1606,12 +1598,12 @@ static void migrate_params_test_apply(MigrateSetParameters *params, dest->cpu_throttle_tailslow = params->cpu_throttle_tailslow; } -if (params->has_tls_creds) { +if (params->tls_creds) {assert (params->tls_creds->type ==QTYPE_QSTRING ); dest->tls_creds = params->tls_creds->u.s; } -if (params->has_tls_hostname) { +if (params->tls_hostname) {assert (params->tls_hostname->type ==QTYPE_QSTRING ); dest->tls_hostname = params->tls_hostname->u.s; }
@@ -1703,19 +1695,19 @@ static void migrate_params_apply(MigrateSetParameters *params, Error **errp) s->parameters.cpu_throttle_tailslow = params->cpu_throttle_tailslow; } -if (params->has_tls_creds) { +if (params->tls_creds) {g_free (s->parameters.tls_creds);assert (params->tls_creds->type ==QTYPE_QSTRING ); s->parameters.tls_creds =g_strdup (params->tls_creds->u.s); } -if (params->has_tls_hostname) { +if (params->tls_hostname) {g_free (s->parameters.tls_hostname);assert (params->tls_hostname->type ==QTYPE_QSTRING ); s->parameters.tls_hostname =g_strdup (params->tls_hostname->u.s); } -if (params->has_tls_authz) { +if (params->tls_authz) {g_free (s->parameters.tls_authz);assert (params->tls_authz->type ==QTYPE_QSTRING ); s->parameters.tls_authz =g_strdup (params->tls_authz->u.s);
@@ -1792,14 +1784,14 @@ void qmp_migrate_set_parameters(MigrateSetParameters *params, Error **errp)MigrationParameters tmp;/* TODO Rewrite "" to null instead */ -if (params->has_tls_creds +if (params->tls_creds && params->tls_creds->type ==QTYPE_QNULL ) {qobject_unref (params->tls_creds->u.n); params->tls_creds->type =QTYPE_QSTRING ; params->tls_creds->u.s =strdup ("" ); }/* TODO Rewrite "" to null instead */ -if (params->has_tls_hostname +if (params->tls_hostname && params->tls_hostname->type ==QTYPE_QNULL ) {qobject_unref (params->tls_hostname->u.n); params->tls_hostname->type =QTYPE_QSTRING ;
@@ -4474,9 +4466,6 @@ static void migration_instance_init(Object *obj) params->has_announce_max = true; params->has_announce_rounds = true; params->has_announce_step = true; - params->has_tls_creds = true; - params->has_tls_hostname = true; - params->has_tls_authz = true;qemu_sem_init (&ms->postcopy_pause_sem,0 );qemu_sem_init (&ms->postcopy_pause_rp_sem,0 );
monitor/hmp-cmds.c +11 -15
@@ -219,8 +219,7 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict)if (info->has_status) {monitor_printf (mon,"Migration status: %s" ,MigrationStatus_str (info->status)); -if (info->status ==MIGRATION_STATUS_FAILED && - info->has_error_desc) { +if (info->status ==MIGRATION_STATUS_FAILED && info->error_desc) {monitor_printf (mon," (%s)\n" , info->error_desc); }else {monitor_printf (mon,"\n" );
@@ -242,7 +241,7 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict) } } -if (info->has_ram) { +if (info->ram) {monitor_printf (mon,"transferred ram: %" PRIu64" kbytes\n" , info->ram->transferred >>10 ); monitor_printf(mon, "throughput: %0.2f mbps\n",
@@ -295,7 +294,7 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict) } } -if (info->has_disk) { +if (info->disk) {monitor_printf (mon,"transferred disk: %" PRIu64" kbytes\n" , info->disk->transferred >>10 ); monitor_printf(mon, "remaining disk: %" PRIu64 " kbytes\n",
@@ -304,7 +303,7 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict) info->disk->total >> 10); } -if (info->has_xbzrle_cache) { +if (info->xbzrle_cache) {monitor_printf (mon,"cache size: %" PRIu64" bytes\n" , info->xbzrle_cache->cache_size); monitor_printf(mon, "xbzrle transferred: %" PRIu64 " kbytes\n",
@@ -321,7 +320,7 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict) info->xbzrle_cache->overflow); } -if (info->has_compression) { +if (info->compression) {monitor_printf (mon,"compression pages: %" PRIu64" pages\n" , info->compression->pages); monitor_printf(mon, "compression busy: %" PRIu64 "\n",
@@ -368,7 +367,7 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict)monitor_printf (mon,"]\n" ); } -if (info->has_vfio) { +if (info->vfio) {monitor_printf (mon,"vfio device transferred: %" PRIu64" kbytes\n" , info->vfio->transferred >>10 ); }
@@ -448,11 +447,11 @@ void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict)monitor_printf (mon,"%s: %u\n" ,MigrationParameter_str (MIGRATION_PARAMETER_MAX_CPU_THROTTLE ), params->max_cpu_throttle); -assert (params->has_tls_creds); +assert (params->tls_creds);monitor_printf (mon,"%s: '%s'\n" ,MigrationParameter_str (MIGRATION_PARAMETER_TLS_CREDS ), params->tls_creds); -assert (params->has_tls_hostname); +assert (params->tls_hostname);monitor_printf (mon,"%s: '%s'\n" ,MigrationParameter_str (MIGRATION_PARAMETER_TLS_HOSTNAME ), params->tls_hostname);
@@ -1237,19 +1236,16 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict)visit_type_uint8 (v, param, &p->max_cpu_throttle, &err);break ;case MIGRATION_PARAMETER_TLS_CREDS : - p->has_tls_creds = true; p->tls_creds =g_new0 (StrOrNull,1 ); p->tls_creds->type =QTYPE_QSTRING ;visit_type_str (v, param, &p->tls_creds->u.s, &err);break ;case MIGRATION_PARAMETER_TLS_HOSTNAME : - p->has_tls_hostname = true; p->tls_hostname =g_new0 (StrOrNull,1 ); p->tls_hostname->type =QTYPE_QSTRING ;visit_type_str (v, param, &p->tls_hostname->u.s, &err);break ;case MIGRATION_PARAMETER_TLS_AUTHZ : - p->has_tls_authz = true; p->tls_authz =g_new0 (StrOrNull,1 ); p->tls_authz->type =QTYPE_QSTRING ;visit_type_str (v, param, &p->tls_authz->u.s, &err);
@@ -1361,7 +1357,7 @@ void hmp_client_migrate_info(Monitor *mon, const QDict *qdict)qmp_client_migrate_info (protocol, hostname, has_port, port, has_tls_port, tls_port, - !!cert_subject, cert_subject, &err); + cert_subject, &err);hmp_handle_error (mon, err); }
@@ -1519,7 +1515,7 @@ static void hmp_migrate_status_cb(void *opaque) info =qmp_query_migrate (NULL );if (!info->has_status || info->status ==MIGRATION_STATUS_ACTIVE || info->status ==MIGRATION_STATUS_SETUP ) { -if (info->has_disk) { +if (info->disk) {int progress;if (info->disk->remaining) {
@@ -1537,7 +1533,7 @@ static void hmp_migrate_status_cb(void *opaque)if (status->is_block_migration) {monitor_printf (status->mon,"\n" ); } -if (info->has_error_desc) { +if (info->error_desc) {error_report ("%s" , info->error_desc); }monitor_resume (status->mon);
monitor/misc.c +1 -1
@@ -398,7 +398,7 @@ static void hmp_info_trace_events(Monitor *mon, const QDict *qdict)void qmp_client_migrate_info (const char *protocol,const char *hostname,bool has_port,int64_t port,bool has_tls_port,int64_t tls_port, -bool has_cert_subject,const char *cert_subject, +const char *cert_subject,Error **errp) {if (strcmp (protocol,"spice" ) ==0 ) {
scripts/qapi/schema.py +0 -1
@@ -759,7 +759,6 @@ def need_has(self): assert self.type # Temporary hack to support dropping the has_FOO in reviewable chunks opt_out = [ - 'qapi/migration.json', 'qapi/misc.json', 'qapi/net.json', 'qapi/pci.json',
Signature · 1 line
2.37.3
PATCH v3 17/30 qapi misc: Elide redundant has_FOO in generated C
In reply to Markus ArmbrusterThe has_FOO for pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundant has_FOO in generated C" provided the means to elide them step by step. This is the step for qapi/misc.json.
Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here.
--- include/monitor/monitor.h | 3 +-- monitor/hmp-cmds.c | 2 +- monitor/misc.c | 19 +++++-------------- monitor/qmp-cmds.c | 6 +----- softmmu/vl.c | 2 +- util/qemu-config.c | 17 +++++------------ scripts/qapi/schema.py | 1 - 7 files changed, 14 insertions(+), 36 deletions(-)
include/monitor/monitor.h +1 -2
@@ -46,8 +46,7 @@ int monitor_read_password(MonitorHMP *mon, ReadLineFunc *readline_func, void *opaque);AddfdInfo *monitor_fdset_add_fd (int fd,bool has_fdset_id,int64_t fdset_id, -bool has_opaque,const char *opaque, -Error **errp); +const char *opaque,Error **errp);int monitor_fdset_dup_fd_add (int64_t fdset_id,int flags);void monitor_fdset_dup_fd_remove (int dup_fd);int64_t monitor_fdset_dup_fd_find (int dup_fd);
monitor/hmp-cmds.c +1 -1
@@ -104,7 +104,7 @@ void hmp_info_name(Monitor *mon, const QDict *qdict)NameInfo *info; info =qmp_query_name (NULL ); -if (info->has_name) { +if (info->name) {monitor_printf (mon,"%s\n" , info->name); }qapi_free_NameInfo (info);
monitor/misc.c +5 -14
@@ -1132,7 +1132,7 @@ void monitor_fdsets_cleanup(void) } } -AddfdInfo *qmp_add_fd (bool has_fdset_id,int64_t fdset_id,bool has_opaque, +AddfdInfo *qmp_add_fd (bool has_fdset_id,int64_t fdset_id,const char *opaque,Error **errp) {int fd;
@@ -1145,8 +1145,7 @@ AddfdInfo *qmp_add_fd(bool has_fdset_id, int64_t fdset_id, bool has_opaque, goto error; } - fdinfo =monitor_fdset_add_fd (fd, has_fdset_id, fdset_id, - has_opaque, opaque, errp); + fdinfo =monitor_fdset_add_fd (fd, has_fdset_id, fdset_id, opaque, errp);if (fdinfo) {return fdinfo; }
@@ -1214,12 +1213,7 @@ FdsetInfoList *qmp_query_fdsets(Error **errp) fdsetfd_info =g_malloc0 (sizeof (*fdsetfd_info)); fdsetfd_info->fd = mon_fdset_fd->fd; -if (mon_fdset_fd->opaque) { - fdsetfd_info->has_opaque = true; - fdsetfd_info->opaque =g_strdup (mon_fdset_fd->opaque); - }else { - fdsetfd_info->has_opaque = false; - } + fdsetfd_info->opaque =g_strdup (mon_fdset_fd->opaque);QAPI_LIST_PREPEND (fdset_info->fds, fdsetfd_info); }
@@ -1231,8 +1225,7 @@ FdsetInfoList *qmp_query_fdsets(Error **errp) }AddfdInfo *monitor_fdset_add_fd (int fd,bool has_fdset_id,int64_t fdset_id, -bool has_opaque,const char *opaque, -Error **errp) +const char *opaque,Error **errp) {MonFdset *mon_fdset =NULL ;MonFdsetFd *mon_fdset_fd;
@@ -1300,9 +1293,7 @@ AddfdInfo *monitor_fdset_add_fd(int fd, bool has_fdset_id, int64_t fdset_id, mon_fdset_fd =g_malloc0 (sizeof (*mon_fdset_fd)); mon_fdset_fd->fd = fd; mon_fdset_fd->removed = false; -if (has_opaque) { - mon_fdset_fd->opaque =g_strdup (opaque); - } + mon_fdset_fd->opaque =g_strdup (opaque);QLIST_INSERT_HEAD (&mon_fdset->fds, mon_fdset_fd, next); fdinfo =g_malloc0 (sizeof (*fdinfo));
monitor/qmp-cmds.c +1 -5
@@ -50,11 +50,7 @@ NameInfo *qmp_query_name(Error **errp) {NameInfo *info =g_malloc0 (sizeof (*info)); -if (qemu_name) { - info->has_name = true; - info->name =g_strdup (qemu_name); - } - + info->name =g_strdup (qemu_name);return info; }
softmmu/vl.c +1 -1
@@ -611,7 +611,7 @@ static int parse_add_fd(void *opaque, QemuOpts *opts, Error **errp) }/* add the duplicate fd, and optionally the opaque string, to the fd set */ - fdinfo =monitor_fdset_add_fd (dupfd, true, fdset_id, !!fd_opaque, fd_opaque, + fdinfo =monitor_fdset_add_fd (dupfd, true, fdset_id, fd_opaque, &error_abort);g_free (fdinfo);
util/qemu-config.c +5 -12
@@ -80,14 +80,8 @@ static CommandLineParameterInfoList *query_option_descs(const QemuOptDesc *desc)break ; } -if (desc[i].help) { - info->has_help = true; - info->help =g_strdup (desc[i].help); - } -if (desc[i].def_value_str) { - info->has_q_default = true; - info->q_default =g_strdup (desc[i].def_value_str); - } + info->help =g_strdup (desc[i].help); + info->q_default =g_strdup (desc[i].def_value_str);QAPI_LIST_PREPEND (param_list, info); }
@@ -245,8 +239,7 @@ static QemuOptsList machine_opts = { } }; -CommandLineOptionInfoList *qmp_query_command_line_options (bool has_option, -const char *option, +CommandLineOptionInfoList *qmp_query_command_line_options (const char *option,Error **errp) {CommandLineOptionInfoList *conf_list =NULL ;
@@ -254,7 +247,7 @@ CommandLineOptionInfoList *qmp_query_command_line_options(bool has_option,int i;for (i =0 ; vm_config_groups[i] !=NULL ; i++) { -if (!has_option || !strcmp (option, vm_config_groups[i]->name)) { +if (!option || !strcmp (option, vm_config_groups[i]->name)) { info =g_malloc0 (sizeof (*info)); info->option =g_strdup (vm_config_groups[i]->name);if (!strcmp ("drive" , vm_config_groups[i]->name)) {
@@ -267,7 +260,7 @@ CommandLineOptionInfoList *qmp_query_command_line_options(bool has_option, } } -if (!has_option || !strcmp (option,"machine" )) { +if (!option || !strcmp (option,"machine" )) { info =g_malloc0 (sizeof (*info)); info->option =g_strdup ("machine" ); info->parameters =query_option_descs (machine_opts.desc);
scripts/qapi/schema.py +0 -1
@@ -759,7 +759,6 @@ def need_has(self): assert self.type # Temporary hack to support dropping the has_FOO in reviewable chunks opt_out = [ - 'qapi/misc.json', 'qapi/net.json', 'qapi/pci.json', 'qapi/qdev.json',
Signature · 1 line
2.37.3
PATCH v3 18/30 qapi net: Elide redundant has_FOO in generated C
In reply to Markus ArmbrusterThe has_FOO for pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundant has_FOO in generated C" provided the means to elide them step by step. This is the step for qapi/net.json.
Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here.
--- hw/net/virtio-net.c | 3 +-- monitor/hmp-cmds.c | 1 - net/announce.c | 8 +++---- net/hub.c | 2 +- net/l2tpv3.c | 2 +- net/net.c | 25 ++++++++++----------- net/slirp.c | 4 ++-- net/socket.c | 18 +++++++-------- net/tap-win32.c | 2 +- net/tap.c | 51 +++++++++++++++++++++--------------------- net/vhost-vdpa.c | 6 ++--- scripts/qapi/schema.py | 1 - 12 files changed, 59 insertions(+), 64 deletions(-)
hw/net/virtio-net.c +1 -2
@@ -447,8 +447,7 @@ static void rxfilter_notify(NetClientState *nc)if (nc->rxfilter_notify_enabled) {char *path =object_get_canonical_path (OBJECT (n->qdev)); -qapi_event_send_nic_rx_filter_changed (!!n->netclient_name, - n->netclient_name, path); +qapi_event_send_nic_rx_filter_changed (n->netclient_name, path);g_free (path);/* disable event notification to avoid events flooding */
monitor/hmp-cmds.c +0 -1
@@ -1104,7 +1104,6 @@ void hmp_announce_self(Monitor *mon, const QDict *qdict) params->interfaces =strList_from_comma_list (interfaces_str); params->has_interfaces = params->interfaces !=NULL ; params->id =g_strdup (id); - params->has_id = !!params->id;qmp_announce_self (params,NULL );qapi_free_AnnounceParameters (params); }
net/announce.c +4 -4
@@ -46,7 +46,7 @@ void qemu_announce_timer_del(AnnounceTimer *timer, bool free_named) }qapi_free_strList (timer->params.interfaces); timer->params.interfaces =NULL ; -if (free_named && timer->params.has_id) { +if (free_named && timer->params.id) {AnnounceTimer *list_timer;/* * Sanity check: There should only be one timer on the list with
@@ -157,7 +157,7 @@ static void qemu_announce_self_iter(NICState *nic, void *opaque) skip = false; } -trace_qemu_announce_self_iter (timer->params.has_id ? timer->params.id :"_" , +trace_qemu_announce_self_iter (timer->params.id ?:"_" , nic->ncs->name,qemu_ether_ntoa (&nic->conf->macaddr), skip);
@@ -199,9 +199,9 @@ void qemu_announce_self(AnnounceTimer *timer, AnnounceParameters *params)void qmp_announce_self (AnnounceParameters *params,Error **errp) {AnnounceTimer *named_timer; -if (!params->has_id) { + +if (!params->id) { params->id =g_strdup ("" ); - params->has_id = true; } named_timer =g_datalist_get_data (&named_timers, params->id);
net/hub.c +1 -1
@@ -274,7 +274,7 @@ int net_init_hubport(const Netdev *netdev, const char *name,assert (!peer); hubport = &netdev->u.hubport; -if (hubport->has_netdev) { +if (hubport->netdev) { hubpeer =qemu_find_netdev (hubport->netdev);if (!hubpeer) {error_setg (errp,"netdev '%s' not found" , hubport->netdev);
net/l2tpv3.c +1 -1
@@ -578,7 +578,7 @@ int net_init_l2tpv3(const Netdev *netdev,if (l2tpv3->has_udp && l2tpv3->udp) { s->udp = true; -if (!(l2tpv3->has_srcport && l2tpv3->has_dstport)) { +if (!(l2tpv3->srcport && l2tpv3->dstport)) {error_setg (errp,"need both src and dst port for udp" ); goto outerr; }else {
net/net.c +12 -13
@@ -964,7 +964,7 @@ static int net_init_nic(const Netdev *netdev, const char *name,memset (nd,0 ,sizeof (*nd)); -if (nic->has_netdev) { +if (nic->netdev) { nd->netdev =qemu_find_netdev (nic->netdev);if (!nd->netdev) {error_setg (errp,"netdev '%s' not found" , nic->netdev);
@@ -975,19 +975,19 @@ static int net_init_nic(const Netdev *netdev, const char *name, nd->netdev = peer; } nd->name =g_strdup (name); -if (nic->has_model) { +if (nic->model) { nd->model =g_strdup (nic->model); } -if (nic->has_addr) { +if (nic->addr) { nd->devaddr =g_strdup (nic->addr); } -if (nic->has_macaddr && +if (nic->macaddr &&net_parse_macaddr (nd->macaddr.a, nic->macaddr) <0 ) {error_setg (errp,"invalid syntax for ethernet address" );return -1 ; } -if (nic->has_macaddr && +if (nic->macaddr &&is_multicast_ether_addr (nd->macaddr.a)) {error_setg (errp,"NIC cannot have multicast MAC address (odd 1st byte)" );
@@ -1081,7 +1081,7 @@ static int net_client_init1(const Netdev *netdev, bool is_netdev, Error **errp)/* Do not add to a hub if it's a nic with a netdev= parameter. */ if (netdev->type !=NET_CLIENT_DRIVER_NIC || - !netdev->u.nic.has_netdev) { + !netdev->u.nic.netdev) { peer =net_hub_add_port (0 ,NULL ,NULL ); } }
@@ -1295,8 +1295,7 @@ void print_net_client(Monitor *mon, NetClientState *nc) } } -RxFilterInfoList *qmp_query_rx_filter (bool has_name,const char *name, -Error **errp) +RxFilterInfoList *qmp_query_rx_filter (const char *name,Error **errp) {NetClientState *nc;RxFilterInfoList *filter_list =NULL , **tail = &filter_list;
@@ -1304,13 +1303,13 @@ RxFilterInfoList *qmp_query_rx_filter(bool has_name, const char *name, QTAILQ_FOREACH(nc, &net_clients, next) {RxFilterInfo *info; -if (has_name &&strcmp (nc->name, name) !=0 ) { +if (name &&strcmp (nc->name, name) !=0 ) {continue ; }/* only query rx-filter information of NIC */ if (nc->info->type !=NET_CLIENT_DRIVER_NIC ) { -if (has_name) { +if (name) {error_setg (errp,"net client(%s) isn't a NIC" , name);assert (!filter_list);return NULL ;
@@ -1327,19 +1326,19 @@ RxFilterInfoList *qmp_query_rx_filter(bool has_name, const char *name,if (nc->info->query_rx_filter) { info = nc->info->query_rx_filter (nc);QAPI_LIST_APPEND (tail, info); - }else if (has_name) { + }else if (name) {error_setg (errp,"net client(%s) doesn't support" " rx-filter querying" , name);assert (!filter_list);return NULL ; } -if (has_name) { +if (name) {break ; } } -if (filter_list ==NULL && has_name) { +if (filter_list ==NULL && name) {error_setg (errp,"invalid net client name: %s" , name); }
net/slirp.c +2 -2
@@ -1153,8 +1153,8 @@ int net_init_slirp(const Netdev *netdev, const char *name, ipv6 =0 ; } - vnet = user->has_net ?g_strdup (user->net) : - user->has_ip ?g_strdup_printf ("%s/24" , user->ip) : + vnet = user->net ?g_strdup (user->net) : + user->ip ?g_strdup_printf ("%s/24" , user->ip) :NULL ; dnssearch =slirp_dnssearch (user->dnssearch);
net/socket.c +9 -9
@@ -705,19 +705,19 @@ int net_init_socket(const Netdev *netdev, const char *name,assert (netdev->type ==NET_CLIENT_DRIVER_SOCKET ); sock = &netdev->u.socket; -if (sock->has_fd + sock->has_listen + sock->has_connect + sock->has_mcast + - sock->has_udp !=1 ) { +if (!!sock->fd + !!sock->listen + !!sock->connect + !!sock->mcast + + !!sock->udp !=1 ) {error_setg (errp,"exactly one of listen=, connect=, mcast= or udp=" " is required" );return -1 ; } -if (sock->has_localaddr && !sock->has_mcast && !sock->has_udp) { +if (sock->localaddr && !sock->mcast && !sock->udp) {error_setg (errp,"localaddr= is only valid with mcast= or udp=" );return -1 ; } -if (sock->has_fd) { +if (sock->fd) {int fd, ret; fd =monitor_fd_param (monitor_cur (), sock->fd, errp);
@@ -737,7 +737,7 @@ int net_init_socket(const Netdev *netdev, const char *name,return 0 ; } -if (sock->has_listen) { +if (sock->listen) {if (net_socket_listen_init (peer,"socket" , name, sock->listen, errp) <0 ) {return -1 ;
@@ -745,7 +745,7 @@ int net_init_socket(const Netdev *netdev, const char *name,return 0 ; } -if (sock->has_connect) { +if (sock->connect) {if (net_socket_connect_init (peer,"socket" , name, sock->connect, errp) <0 ) {return -1 ;
@@ -753,7 +753,7 @@ int net_init_socket(const Netdev *netdev, const char *name,return 0 ; } -if (sock->has_mcast) { +if (sock->mcast) {/* if sock->localaddr is missing, it has been initialized to "all bits * zero" */ if (net_socket_mcast_init(peer, "socket", name, sock->mcast,
@@ -763,8 +763,8 @@ int net_init_socket(const Netdev *netdev, const char *name,return 0 ; } -assert (sock->has_udp); -if (!sock->has_localaddr) { +assert (sock->udp); +if (!sock->localaddr) {error_setg (errp,"localaddr= is mandatory with udp=" );return -1 ; }
net/tap-win32.c +1 -1
@@ -807,7 +807,7 @@ int net_init_tap(const Netdev *netdev, const char *name,assert (netdev->type ==NET_CLIENT_DRIVER_TAP ); tap = &netdev->u.tap; -if (!tap->has_ifname) { +if (!tap->ifname) {error_report ("tap: no interface name" );return -1 ; }
net/tap.c +25 -26
129 lines not on this page · raw message
net/vhost-vdpa.c +3 -3
@@ -634,19 +634,19 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name,assert (netdev->type ==NET_CLIENT_DRIVER_VHOST_VDPA ); opts = &netdev->u.vhost_vdpa; -if (!opts->has_vhostdev && !opts->has_vhostfd) { +if (!opts->vhostdev && !opts->vhostfd) {error_setg (errp,"vhost-vdpa: neither vhostdev= nor vhostfd= was specified" );return -1 ; } -if (opts->has_vhostdev && opts->has_vhostfd) { +if (opts->vhostdev && opts->vhostfd) {error_setg (errp,"vhost-vdpa: vhostdev= and vhostfd= are mutually exclusive" );return -1 ; } -if (opts->has_vhostdev) { +if (opts->vhostdev) { vdpa_device_fd =qemu_open (opts->vhostdev,O_RDWR , errp);if (vdpa_device_fd ==-1 ) {return -errno;
scripts/qapi/schema.py +0 -1
@@ -759,7 +759,6 @@ def need_has(self): assert self.type # Temporary hack to support dropping the has_FOO in reviewable chunks opt_out = [ - 'qapi/net.json', 'qapi/pci.json', 'qapi/qdev.json', 'qapi/qom.json',
Signature · 1 line
2.37.3
Re: [PATCH v3 18/30] qapi net: Elide redundant has_FOO in generated C
Quoted 10 lines · Markus Armbruster
The
has_FOOfor pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundanthas_FOOin generated C" provided the means to elide them step by step. This is the step forqapi/net.json.Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here.
Cc Jason Wang <[email protected]>Signed-off-by Markus Armbruster <[email protected]>
Quoted 14 lines
--- hw/net/virtio-net.c | 3 +-- monitor/hmp-cmds.c | 1 - net/announce.c | 8 +++---- net/hub.c | 2 +- net/l2tpv3.c | 2 +- net/net.c | 25 ++++++++++----------- net/slirp.c | 4 ++-- net/socket.c | 18 +++++++-------- net/tap-win32.c | 2 +- net/tap.c | 51 +++++++++++++++++++++--------------------- net/vhost-vdpa.c | 6 ++--- scripts/qapi/schema.py | 1 - 12 files changed, 59 insertions(+), 64 deletions(-)
PATCH v3 19/30 qapi pci: Elide redundant has_FOO in generated C
In reply to Markus ArmbrusterThe has_FOO for pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundant has_FOO in generated C" provided the means to elide them step by step. This is the step for qapi/pci.json.
Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here.
--- hw/pci/pci.c | 2 -- monitor/hmp-cmds.c | 6 +++--- scripts/qapi/schema.py | 1 - 3 files changed, 3 insertions(+), 6 deletions(-)
hw/pci/pci.c +0 -2
@@ -1879,7 +1879,6 @@ static PciDeviceInfo *qmp_query_pci_device(PCIDevice *dev, PCIBus *bus, info->class_info->q_class = class; desc =get_class_desc (class);if (desc->desc) { - info->class_info->has_desc = true; info->class_info->desc =g_strdup (desc->desc); }
@@ -1897,7 +1896,6 @@ static PciDeviceInfo *qmp_query_pci_device(PCIDevice *dev, PCIBus *bus, type = dev->config[PCI_HEADER_TYPE ] & ~PCI_HEADER_TYPE_MULTI_FUNCTION ;if (type ==PCI_HEADER_TYPE_BRIDGE ) { - info->has_pci_bridge = true; info->pci_bridge =qmp_query_pci_bridge (dev, bus, bus_num); }else if (type ==PCI_HEADER_TYPE_NORMAL ) { info->id->has_subsystem = info->id->has_subsystem_vendor = true;
monitor/hmp-cmds.c +3 -3
@@ -709,7 +709,7 @@ static void hmp_info_pci_device(Monitor *mon, const PciDeviceInfo *dev) dev->slot, dev->function);monitor_printf (mon," " ); -if (dev->class_info->has_desc) { +if (dev->class_info->desc) {monitor_puts (mon, dev->class_info->desc); }else {monitor_printf (mon,"Class %04" PRId64, dev->class_info->q_class);
@@ -727,7 +727,7 @@ static void hmp_info_pci_device(Monitor *mon, const PciDeviceInfo *dev) dev->irq, (char)('A' + dev->irq_pin - 1)); } -if (dev->has_pci_bridge) { +if (dev->pci_bridge) {monitor_printf (mon," BUS %" PRId64".\n" , dev->pci_bridge->bus->number); monitor_printf(mon, " secondary bus %" PRId64 ".\n",
@@ -773,7 +773,7 @@ static void hmp_info_pci_device(Monitor *mon, const PciDeviceInfo *dev)monitor_printf (mon," id \"%s\"\n" , dev->qdev_id); -if (dev->has_pci_bridge) { +if (dev->pci_bridge) {if (dev->pci_bridge->has_devices) {PciDeviceInfoList *cdev;for (cdev = dev->pci_bridge->devices; cdev; cdev = cdev->next) {
scripts/qapi/schema.py +0 -1
@@ -759,7 +759,6 @@ def need_has(self): assert self.type # Temporary hack to support dropping the has_FOO in reviewable chunks opt_out = [ - 'qapi/pci.json', 'qapi/qdev.json', 'qapi/qom.json', 'qapi/replay.json',
Signature · 1 line
2.37.3
PATCH v3 20/30 qapi qdev qom: Elide redundant has_FOO in generated C
In reply to Markus ArmbrusterThe has_FOO for pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundant has_FOO in generated C" provided the means to elide them step by step. This is the step for qapi/qdev.json and qapi/qom.json.
Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here.
--- hw/acpi/memory_hotplug.c | 2 +- hw/core/qdev.c | 2 +- hw/ppc/spapr.c | 2 +- hw/ppc/spapr_drc.c | 3 +-- qom/qom-qmp-cmds.c | 7 +------ stubs/qdev.c | 6 ++---- tests/qtest/fuzz/qos_fuzz.c | 3 +-- scripts/qapi/schema.py | 2 -- 8 files changed, 8 insertions(+), 19 deletions(-)
hw/acpi/memory_hotplug.c +1 -1
@@ -185,7 +185,7 @@ static void acpi_memory_hotplug_write(void *opaque, hwaddr addr, uint64_t data,*/ qapi_event_send_mem_unplug_error (dev->id ? :"" ,error_get_pretty (local_err)); -qapi_event_send_device_unplug_guest_error (!!dev->id, dev->id, +qapi_event_send_device_unplug_guest_error (dev->id, dev->canonical_path);error_free (local_err);break ;
hw/core/qdev.c +1 -1
@@ -744,7 +744,7 @@ static void device_finalize(Object *obj)if (dev->pending_deleted_event) {g_assert (dev->canonical_path); -qapi_event_send_device_deleted (!!dev->id, dev->id, dev->canonical_path); +qapi_event_send_device_deleted (dev->id, dev->canonical_path);g_free (dev->canonical_path); dev->canonical_path =NULL ; }
hw/ppc/spapr.c +1 -1
@@ -3728,7 +3728,7 @@ void spapr_memory_unplug_rollback(SpaprMachineState *spapr, DeviceState *dev)qapi_event_send_mem_unplug_error (dev->id ? :"" , qapi_error); -qapi_event_send_device_unplug_guest_error (!!dev->id, dev->id, +qapi_event_send_device_unplug_guest_error (dev->id, dev->canonical_path); }
hw/ppc/spapr_drc.c +1 -2
@@ -175,8 +175,7 @@ static uint32_t drc_unisolate_logical(SpaprDrc *drc) "for device %s", drc->dev->id); } -qapi_event_send_device_unplug_guest_error (!!drc->dev->id, - drc->dev->id, +qapi_event_send_device_unplug_guest_error (drc->dev->id, drc->dev->canonical_path); }
qom/qom-qmp-cmds.c +1 -6
@@ -99,15 +99,13 @@ static void qom_list_types_tramp(ObjectClass *klass, void *data) info->name =g_strdup (object_class_get_name (klass)); info->has_abstract = info->abstract =object_class_is_abstract (klass);if (parent) { - info->has_parent = true; info->parent =g_strdup (object_class_get_name (parent)); }QAPI_LIST_PREPEND (*pret, info); } -ObjectTypeInfoList *qmp_qom_list_types (bool has_implements, -const char *implements, +ObjectTypeInfoList *qmp_qom_list_types (const char *implements,bool has_abstract,bool abstract,Error **errp)
@@ -168,10 +166,8 @@ ObjectPropertyInfoList *qmp_device_list_properties(const char *typename, info =g_new0 (ObjectPropertyInfo,1 ); info->name =g_strdup (prop->name); info->type =g_strdup (prop->type); - info->has_description = !!prop->description; info->description =g_strdup (prop->description); info->default_value =qobject_ref (prop->defval); - info->has_default_value = !!info->default_value;QAPI_LIST_PREPEND (prop_list, info); }
@@ -215,7 +211,6 @@ ObjectPropertyInfoList *qmp_qom_list_properties(const char *typename, info =g_malloc0 (sizeof (*info)); info->name =g_strdup (prop->name); info->type =g_strdup (prop->type); - info->has_description = !!prop->description; info->description =g_strdup (prop->description);QAPI_LIST_PREPEND (prop_list, info);
stubs/qdev.c +2 -4
@@ -15,15 +15,13 @@#include "qemu/osdep.h" #include "qapi/qapi-events-qdev.h" -void qapi_event_send_device_deleted (bool has_device, -const char *device, +void qapi_event_send_device_deleted (const char *device,const char *path) {/* Nothing to do. */ } -void qapi_event_send_device_unplug_guest_error (bool has_device, -const char *device, +void qapi_event_send_device_unplug_guest_error (const char *device,const char *path) {/* Nothing to do. */
tests/qtest/fuzz/qos_fuzz.c +1 -2
@@ -50,8 +50,7 @@ static void qos_set_machines_devices_available(void)machines_apply_to_node (mach_info);qapi_free_MachineInfoList (mach_info); - type_info =qmp_qom_list_types (true,"device" , true, true, - &error_abort); + type_info =qmp_qom_list_types ("device" , true, true, &error_abort);types_apply_to_node (type_info);qapi_free_ObjectTypeInfoList (type_info); }
scripts/qapi/schema.py +0 -2
@@ -759,8 +759,6 @@ def need_has(self): assert self.type # Temporary hack to support dropping the has_FOO in reviewable chunks opt_out = [ - 'qapi/qdev.json', - 'qapi/qom.json', 'qapi/replay.json', 'qapi/rocker.json', 'qapi/run-state.json',
Signature · 1 line
2.37.3
Re: [PATCH v3 20/30] qapi qdev qom: Elide redundant has_FOO in generated C
Quoted 13 lines · Markus Armbruster
The
has_FOOfor pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundanthas_FOOin generated C" provided the means to elide them step by step. This is the step forqapi/qdev.jsonandqapi/qom.json.Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here.
Cc Paolo Bonzini <[email protected]>Cc Daniel P. Berrangé <[email protected]>Cc Eduardo Habkost <[email protected]>Signed-off-by Markus Armbruster <[email protected]>
Quoted 10 lines
--- hw/acpi/memory_hotplug.c | 2 +- hw/core/qdev.c | 2 +- hw/ppc/spapr.c | 2 +- hw/ppc/spapr_drc.c | 3 +-- qom/qom-qmp-cmds.c | 7 +------ stubs/qdev.c | 6 ++---- tests/qtest/fuzz/qos_fuzz.c | 3 +-- scripts/qapi/schema.py | 2 -- 8 files changed, 8 insertions(+), 19 deletions(-)
PATCH v3 21/30 qapi replay: Elide redundant has_FOO in generated C
In reply to Markus ArmbrusterThe has_FOO for pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundant has_FOO in generated C" provided the means to elide them step by step. This is the step for qapi/replay.json.
Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here.
--- replay/replay-debugging.c | 1 - scripts/qapi/schema.py | 1 - 2 files changed, 2 deletions(-)
replay/replay-debugging.c +0 -1
@@ -50,7 +50,6 @@ ReplayInfo *qmp_query_replay(Error **errp) retval->mode = replay_mode;if (replay_get_filename ()) { retval->filename =g_strdup (replay_get_filename ()); - retval->has_filename = true; } retval->icount =replay_get_current_icount ();return retval;
scripts/qapi/schema.py +0 -1
@@ -759,7 +759,6 @@ def need_has(self): assert self.type # Temporary hack to support dropping the has_FOO in reviewable chunks opt_out = [ - 'qapi/replay.json', 'qapi/rocker.json', 'qapi/run-state.json', 'qapi/stats.json',
Signature · 1 line
2.37.3
PATCH v3 22/30 qapi rocker: Elide redundant has_FOO in generated C
In reply to Markus ArmbrusterThe has_FOO for pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundant has_FOO in generated C" provided the means to elide them step by step. This is the step for qapi/rocker.json.
Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here.
--- hw/net/rocker/rocker_of_dpa.c | 13 ++----------- monitor/hmp-cmds.c | 22 +++++++++++----------- scripts/qapi/schema.py | 1 - 3 files changed, 13 insertions(+), 23 deletions(-)
hw/net/rocker/rocker_of_dpa.c +2 -11
@@ -2348,23 +2348,19 @@ static void of_dpa_flow_fill(void *cookie, void *value, void *user_data)if (memcmp (key->eth.src.a, zero_mac.a,ETH_ALEN ) ||memcmp (mask->eth.src.a, zero_mac.a,ETH_ALEN )) { - nkey->has_eth_src = true; nkey->eth_src =qemu_mac_strdup_printf (key->eth.src.a); } -if (nkey->has_eth_src &&memcmp (mask->eth.src.a, ff_mac.a,ETH_ALEN )) { - nmask->has_eth_src = true; +if (nkey->eth_src &&memcmp (mask->eth.src.a, ff_mac.a,ETH_ALEN )) { nmask->eth_src =qemu_mac_strdup_printf (mask->eth.src.a); }if (memcmp (key->eth.dst.a, zero_mac.a,ETH_ALEN ) ||memcmp (mask->eth.dst.a, zero_mac.a,ETH_ALEN )) { - nkey->has_eth_dst = true; nkey->eth_dst =qemu_mac_strdup_printf (key->eth.dst.a); } -if (nkey->has_eth_dst &&memcmp (mask->eth.dst.a, ff_mac.a,ETH_ALEN )) { - nmask->has_eth_dst = true; +if (nkey->eth_dst &&memcmp (mask->eth.dst.a, ff_mac.a,ETH_ALEN )) { nmask->eth_dst =qemu_mac_strdup_printf (mask->eth.dst.a); }
@@ -2400,7 +2396,6 @@ static void of_dpa_flow_fill(void *cookie, void *value, void *user_data)if (key->ipv4.addr.dst || mask->ipv4.addr.dst) {char *dst =inet_ntoa (*(struct in_addr *)&key->ipv4.addr.dst);int dst_len =of_dpa_mask2prefix (mask->ipv4.addr.dst); - nkey->has_ip_dst = true; nkey->ip_dst =g_strdup_printf ("%s/%d" , dst, dst_len); }break ;
@@ -2501,12 +2496,10 @@ static void of_dpa_group_fill(void *key, void *value, void *user_data) ngroup->set_vlan_id =ntohs (group->l2_rewrite.vlan_id); }if (memcmp (group->l2_rewrite.src_mac.a, zero_mac.a,ETH_ALEN )) { - ngroup->has_set_eth_src = true; ngroup->set_eth_src =qemu_mac_strdup_printf (group->l2_rewrite.src_mac.a); }if (memcmp (group->l2_rewrite.dst_mac.a, zero_mac.a,ETH_ALEN )) { - ngroup->has_set_eth_dst = true; ngroup->set_eth_dst =qemu_mac_strdup_printf (group->l2_rewrite.dst_mac.a); }
@@ -2532,12 +2525,10 @@ static void of_dpa_group_fill(void *key, void *value, void *user_data) ngroup->set_vlan_id =ntohs (group->l3_unicast.vlan_id); }if (memcmp (group->l3_unicast.src_mac.a, zero_mac.a,ETH_ALEN )) { - ngroup->has_set_eth_src = true; ngroup->set_eth_src =qemu_mac_strdup_printf (group->l3_unicast.src_mac.a); }if (memcmp (group->l3_unicast.dst_mac.a, zero_mac.a,ETH_ALEN )) { - ngroup->has_set_eth_dst = true; ngroup->set_eth_dst =qemu_mac_strdup_printf (group->l3_unicast.dst_mac.a); }
monitor/hmp-cmds.c +11 -11
@@ -2010,35 +2010,35 @@ void hmp_rocker_of_dpa_flows(Monitor *mon, const QDict *qdict) } } -if (key->has_eth_src) { +if (key->eth_src) {if ((strcmp (key->eth_src,"01:00:00:00:00:00" ) ==0 ) && - (mask->has_eth_src) && + mask->eth_src && (strcmp (mask->eth_src,"01:00:00:00:00:00" ) ==0 )) {monitor_printf (mon," src <any mcast/bcast>" ); }else if ((strcmp (key->eth_src,"00:00:00:00:00:00" ) ==0 ) && - (mask->has_eth_src) && + mask->eth_src && (strcmp (mask->eth_src,"01:00:00:00:00:00" ) ==0 )) {monitor_printf (mon," src <any ucast>" ); }else {monitor_printf (mon," src %s" , key->eth_src); -if (mask->has_eth_src) { +if (mask->eth_src) {monitor_printf (mon,"(%s)" , mask->eth_src); } } } -if (key->has_eth_dst) { +if (key->eth_dst) {if ((strcmp (key->eth_dst,"01:00:00:00:00:00" ) ==0 ) && - (mask->has_eth_dst) && + mask->eth_dst && (strcmp (mask->eth_dst,"01:00:00:00:00:00" ) ==0 )) {monitor_printf (mon," dst <any mcast/bcast>" ); }else if ((strcmp (key->eth_dst,"00:00:00:00:00:00" ) ==0 ) && - (mask->has_eth_dst) && + mask->eth_dst && (strcmp (mask->eth_dst,"01:00:00:00:00:00" ) ==0 )) {monitor_printf (mon," dst <any ucast>" ); }else {monitor_printf (mon," dst %s" , key->eth_dst); -if (mask->has_eth_dst) { +if (mask->eth_dst) {monitor_printf (mon,"(%s)" , mask->eth_dst); } }
@@ -2058,7 +2058,7 @@ void hmp_rocker_of_dpa_flows(Monitor *mon, const QDict *qdict) } } -if (key->has_ip_dst) { +if (key->ip_dst) {monitor_printf (mon," dst %s" , key->ip_dst); }
@@ -2137,7 +2137,7 @@ void hmp_rocker_of_dpa_groups(Monitor *mon, const QDict *qdict) group->set_vlan_id & VLAN_VID_MASK); } -if (group->has_set_eth_src) { +if (group->set_eth_src) {if (!set) { set = true;monitor_printf (mon," set" );
@@ -2145,7 +2145,7 @@ void hmp_rocker_of_dpa_groups(Monitor *mon, const QDict *qdict)monitor_printf (mon," src %s" , group->set_eth_src); } -if (group->has_set_eth_dst) { +if (group->set_eth_dst) {if (!set) {monitor_printf (mon," set" ); }
scripts/qapi/schema.py +0 -1
@@ -759,7 +759,6 @@ def need_has(self): assert self.type # Temporary hack to support dropping the has_FOO in reviewable chunks opt_out = [ - 'qapi/rocker.json', 'qapi/run-state.json', 'qapi/stats.json', 'qapi/tpm.json',
Signature · 1 line
2.37.3
Re: [PATCH v3 22/30] qapi rocker: Elide redundant has_FOO in generated C
Quoted 8 lines · Markus Armbruster
The
has_FOOfor pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundanthas_FOOin generated C" provided the means to elide them step by step. This is the step forqapi/rocker.json.Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here.
Quoted 7 lines
Cc Jiri Pirko <[email protected]>Signed-off-by Markus Armbruster <[email protected]>--- hw/net/rocker/rocker_of_dpa.c | 13 ++----------- monitor/hmp-cmds.c | 22 +++++++++++----------- scripts/qapi/schema.py | 1 - 3 files changed, 13 insertions(+), 23 deletions(-)
PATCH v3 23/30 qapi run-state: Elide redundant has_FOO in generated C
In reply to Markus ArmbrusterThe has_FOO for pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundant has_FOO in generated C" provided the means to elide them step by step. This is the step for qapi/run-state.json.
Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here.
Drop a superfluous conditional aroundqapi_free_GuestPanicInformation() while there.
--- softmmu/runstate.c | 18 +++++------------- scripts/qapi/schema.py | 1 - 2 files changed, 5 insertions(+), 14 deletions(-)
softmmu/runstate.c +5 -13
@@ -484,18 +484,15 @@ void qemu_system_guest_panicked(GuestPanicInformation *info)*/ if (panic_action ==PANIC_ACTION_PAUSE || (panic_action ==PANIC_ACTION_SHUTDOWN && shutdown_action ==SHUTDOWN_ACTION_PAUSE )) { -qapi_event_send_guest_panicked (GUEST_PANIC_ACTION_PAUSE , - !!info, info); +qapi_event_send_guest_panicked (GUEST_PANIC_ACTION_PAUSE , info);vm_stop (RUN_STATE_GUEST_PANICKED ); }else if (panic_action ==PANIC_ACTION_SHUTDOWN || panic_action ==PANIC_ACTION_EXIT_FAILURE ) { -qapi_event_send_guest_panicked (GUEST_PANIC_ACTION_POWEROFF , - !!info, info); +qapi_event_send_guest_panicked (GUEST_PANIC_ACTION_POWEROFF , info);vm_stop (RUN_STATE_GUEST_PANICKED );qemu_system_shutdown_request (SHUTDOWN_CAUSE_GUEST_PANIC ); }else { -qapi_event_send_guest_panicked (GUEST_PANIC_ACTION_RUN , - !!info, info); +qapi_event_send_guest_panicked (GUEST_PANIC_ACTION_RUN , info); }if (info) {
@@ -522,13 +519,8 @@ void qemu_system_guest_panicked(GuestPanicInformation *info)void qemu_system_guest_crashloaded (GuestPanicInformation *info) {qemu_log_mask (LOG_GUEST_ERROR ,"Guest crash loaded" ); - -qapi_event_send_guest_crashloaded (GUEST_PANIC_ACTION_RUN , - !!info, info); - -if (info) { -qapi_free_GuestPanicInformation (info); - } +qapi_event_send_guest_crashloaded (GUEST_PANIC_ACTION_RUN , info); +qapi_free_GuestPanicInformation (info); }void qemu_system_reset_request (ShutdownCause reason)
scripts/qapi/schema.py +0 -1
@@ -759,7 +759,6 @@ def need_has(self): assert self.type # Temporary hack to support dropping the has_FOO in reviewable chunks opt_out = [ - 'qapi/run-state.json', 'qapi/stats.json', 'qapi/tpm.json', 'qapi/transaction.json',
Signature · 1 line
2.37.3
PATCH v3 24/30 qapi stats: Elide redundant has_FOO in generated C
In reply to Markus ArmbrusterThe has_FOO for pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundant has_FOO in generated C" provided the means to elide them step by step. This is the step for qapi/stats.json.
Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here.
--- monitor/qmp-cmds.c | 5 +---- scripts/qapi/schema.py | 1 - 2 files changed, 1 insertion(+), 5 deletions(-)
monitor/qmp-cmds.c +1 -4
@@ -560,10 +560,7 @@ void add_stats_entry(StatsResultList **stats_results, StatsProvider provider,StatsResult *entry =g_new0 (StatsResult,1 ); entry->provider = provider; -if (qom_path) { - entry->has_qom_path = true; - entry->qom_path =g_strdup (qom_path); - } + entry->qom_path =g_strdup (qom_path); entry->stats = stats_list;QAPI_LIST_PREPEND (*stats_results, entry);
scripts/qapi/schema.py +0 -1
@@ -759,7 +759,6 @@ def need_has(self): assert self.type # Temporary hack to support dropping the has_FOO in reviewable chunks opt_out = [ - 'qapi/stats.json', 'qapi/tpm.json', 'qapi/transaction.json', 'qapi/ui.json',
Signature · 1 line
2.37.3
PATCH v3 25/30 qapi tpm: Elide redundant has_FOO in generated C
In reply to Markus ArmbrusterThe has_FOO for pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundant has_FOO in generated C" provided the means to elide them step by step. This is the step for qapi/tpm.json.
Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here.
--- backends/tpm/tpm_passthrough.c | 2 -- monitor/hmp-cmds.c | 8 ++++---- scripts/qapi/schema.py | 1 - 3 files changed, 4 insertions(+), 7 deletions(-)
backends/tpm/tpm_passthrough.c +0 -2
@@ -259,12 +259,10 @@ tpm_passthrough_handle_device_opts(TPMPassthruState *tpm_pt, QemuOpts *opts) value =qemu_opt_get (opts,"cancel-path" );if (value) { tpm_pt->options->cancel_path =g_strdup (value); - tpm_pt->options->has_cancel_path = true; } value =qemu_opt_get (opts,"path" );if (value) { - tpm_pt->options->has_path = true; tpm_pt->options->path =g_strdup (value); }
monitor/hmp-cmds.c +4 -4
@@ -864,10 +864,10 @@ void hmp_info_tpm(Monitor *mon, const QDict *qdict)case TPM_TYPE_PASSTHROUGH : tpo = ti->options->u.passthrough.data;monitor_printf (mon,"%s%s%s%s" , - tpo->has_path ?",path=" :"" , - tpo->has_path ? tpo->path :"" , - tpo->has_cancel_path ?",cancel-path=" :"" , - tpo->has_cancel_path ? tpo->cancel_path :"" ); + tpo->path ?",path=" :"" , + tpo->path ?:"" , + tpo->cancel_path ?",cancel-path=" :"" , + tpo->cancel_path ?:"" );break ;case TPM_TYPE_EMULATOR : teo = ti->options->u.emulator.data;
scripts/qapi/schema.py +0 -1
@@ -759,7 +759,6 @@ def need_has(self): assert self.type # Temporary hack to support dropping the has_FOO in reviewable chunks opt_out = [ - 'qapi/tpm.json', 'qapi/transaction.json', 'qapi/ui.json', 'qapi/virtio.json',
Signature · 1 line
2.37.3
PATCH v3 26/30 qapi transaction: Elide redundant has_FOO in generated C
In reply to Markus ArmbrusterThe has_FOO for pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundant has_FOO in generated C" provided the means to elide them step by step. This is the step for qapi/transaction.json.
Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here.
In qmp_transaction(), we can't just drop parameter @has_props, since it's used to track whether @props needs to be freed. Replace it by a local variable.
--- blockdev.c | 4 ++-- scripts/qapi/schema.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-)
blockdev.c +2 -2
@@ -1048,7 +1048,7 @@ static void blockdev_do_action(TransactionAction *action, Error **errp) list.value = action; list.next =NULL ; -qmp_transaction (&list, false,NULL , errp); +qmp_transaction (&list,NULL , errp); } void qmp_blockdev_snapshot_sync(const char *device, const char *node_name,
@@ -2289,11 +2289,11 @@ static TransactionProperties *get_transaction_properties(* Always run under BQL. */ void qmp_transaction (TransactionActionList *dev_list, -bool has_props,struct TransactionProperties *props,Error **errp) {TransactionActionList *dev_entry = dev_list; +bool has_props = !!props;JobTxn *block_job_txn =NULL ;BlkActionState *state, *next;Error *local_err =NULL ;
scripts/qapi/schema.py +0 -1
@@ -759,7 +759,6 @@ def need_has(self): assert self.type # Temporary hack to support dropping the has_FOO in reviewable chunks opt_out = [ - 'qapi/transaction.json', 'qapi/ui.json', 'qapi/virtio.json', 'qga/qapi-schema.json']
Signature · 1 line
2.37.3
Re: [PATCH v3 26/30] qapi transaction: Elide redundant has_FOO in generated C
Quoted 12 lines · Markus Armbruster
The
has_FOOfor pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundanthas_FOOin generated C" provided the means to elide them step by step. This is the step forqapi/transaction.json.Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here.
In
qmp_transaction(), we can't just drop parameter @has_props, since it's used to track whether @props needs to be freed. Replace it by a local variable.
Quoted 8 lines
Cc Kevin Wolf <[email protected]>Cc Hanna Reitz <[email protected]>Signed-off-by Markus Armbruster <[email protected]>--- blockdev.c | 4 ++-- scripts/qapi/schema.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-)
PATCH v3 27/30 qapi ui: Elide redundant has_FOO in generated C
In reply to Markus ArmbrusterThe has_FOO for pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundant has_FOO in generated C" provided the means to elide them step by step. This is the step for qapi/ui.json.
Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here.
--- monitor/hmp-cmds.c | 12 ++++-------- ui/console.c | 4 ++-- ui/input.c | 4 ++-- ui/spice-core.c | 5 ----- ui/vnc.c | 10 ---------- scripts/qapi/schema.py | 1 - 6 files changed, 8 insertions(+), 28 deletions(-)
monitor/hmp-cmds.c +4 -8
@@ -548,11 +548,9 @@ static void hmp_info_vnc_clients(Monitor *mon, VncClientInfoList *client)hmp_info_VncBasicInfo (mon,qapi_VncClientInfo_base (cinfo),"Client" );monitor_printf (mon," x509_dname: %s\n" , - cinfo->has_x509_dname ? - cinfo->x509_dname :"none" ); + cinfo->x509_dname ?:"none" );monitor_printf (mon," sasl_username: %s\n" , - cinfo->has_sasl_username ? - cinfo->sasl_username :"none" ); + cinfo->sasl_username ?:"none" ); client = client->next; }
@@ -597,7 +595,7 @@ void hmp_info_vnc(Monitor *mon, const QDict *qdict)hmp_info_vnc_authcrypt (mon," " , info->auth, info->has_vencrypt ? &info->vencrypt :NULL ); } -if (info->has_display) { +if (info->display) {monitor_printf (mon," Display: %s\n" , info->display); } info2l = info2l->next;
@@ -1401,7 +1399,6 @@ void hmp_set_password(Monitor *mon, const QDict *qdict) }if (opts.protocol ==DISPLAY_PROTOCOL_VNC ) { - opts.u.vnc.has_display = !!display; opts.u.vnc.display = (char *)display; }
@@ -1429,7 +1426,6 @@ void hmp_expire_password(Monitor *mon, const QDict *qdict) }if (opts.protocol ==DISPLAY_PROTOCOL_VNC ) { - opts.u.vnc.has_display = !!display; opts.u.vnc.display = (char *)display; }
@@ -1714,7 +1710,7 @@ hmp_screendump(Monitor *mon, const QDict *qdict) goto end; } -qmp_screendump (filename, id !=NULL , id, id !=NULL , head, +qmp_screendump (filename, id, id !=NULL , head, input_format !=NULL , format, &err); end:hmp_handle_error (mon, err);
ui/console.c +2 -2
@@ -407,7 +407,7 @@ static void graphic_hw_update_bh(void *con)/* Safety: coroutine-only, concurrent-coroutine safe, main thread only */ void coroutine_fn -qmp_screendump (const char *filename,bool has_device,const char *device, +qmp_screendump (const char *filename,const char *device,bool has_head,int64_t head,bool has_format,ImageFormat format,Error **errp) {
@@ -416,7 +416,7 @@ qmp_screendump(const char *filename, bool has_device, const char *device,DisplaySurface *surface;int fd; -if (has_device) { +if (device) { con =qemu_console_lookup_by_device_name (device, has_head ? head :0 , errp);if (!con) {
ui/input.c +2 -2
@@ -124,7 +124,7 @@ qemu_input_find_handler(uint32_t mask, QemuConsole *con)return NULL ; } -void qmp_input_send_event (bool has_device,const char *device, +void qmp_input_send_event (const char *device,bool has_head,int64_t head,InputEventList *events,Error **errp) {
@@ -133,7 +133,7 @@ void qmp_input_send_event(bool has_device, const char *device,Error *err =NULL ; con =NULL ; -if (has_device) { +if (device) {if (!has_head) { head =0 ; }
ui/spice-core.c +0 -5
@@ -222,7 +222,6 @@ static void channel_event(int event, SpiceChannelEventInfo *info)break ;case SPICE_CHANNEL_EVENT_INITIALIZED :if (auth) { - server->has_auth = true; server->auth =g_strdup (auth); }add_channel_info (client, info);
@@ -522,13 +521,9 @@ static SpiceInfo *qmp_query_spice_real(Error **errp) port =qemu_opt_get_number (opts,"port" ,0 ); tls_port =qemu_opt_get_number (opts,"tls-port" ,0 ); - info->has_auth = true; info->auth =g_strdup (auth); - - info->has_host = true; info->host =g_strdup (addr ? addr :"*" ); - info->has_compiled_version = true; major = (SPICE_SERVER_VERSION &0xff0000 ) >>16 ; minor = (SPICE_SERVER_VERSION &0xff00 ) >>8 ; micro =SPICE_SERVER_VERSION &0xff ;
ui/vnc.c +0 -10
@@ -244,7 +244,6 @@ static VncServerInfo *vnc_server_info_get(VncDisplay *vd) info =g_malloc0 (sizeof (*info));vnc_init_basic_info_from_server_addr (vd->listener->sioc[0 ],qapi_VncServerInfo_base (info), &err); - info->has_auth = true; info->auth =g_strdup (vnc_auth_name (vd));if (err) {qapi_free_VncServerInfo (info);
@@ -263,13 +262,10 @@ static void vnc_client_cache_auth(VncState *client)if (client->tls) { client->info->x509_dname =qcrypto_tls_session_get_peer_name (client->tls); - client->info->has_x509_dname = - client->info->x509_dname !=NULL ; }#ifdef CONFIG_VNC_SASL if (client->sasl.conn && client->sasl.username) { - client->info->has_sasl_username = true; client->info->sasl_username =g_strdup (client->sasl.username); }#endif
@@ -341,11 +337,9 @@ static VncClientInfo *qmp_query_vnc_client(const VncState *client)if (client->tls) { info->x509_dname =qcrypto_tls_session_get_peer_name (client->tls); - info->has_x509_dname = info->x509_dname !=NULL ; }#ifdef CONFIG_VNC_SASL if (client->sasl.conn && client->sasl.username) { - info->has_sasl_username = true; info->sasl_username =g_strdup (client->sasl.username); }#endif
@@ -426,11 +420,8 @@ VncInfo *qmp_query_vnc(Error **errp)abort (); } - info->has_host = true; - info->has_service = true; info->has_family = true; - info->has_auth = true; info->auth =g_strdup (vnc_auth_name (vd)); }
@@ -568,7 +559,6 @@ VncInfo2List *qmp_query_vnc_servers(Error **errp)if (vd->dcl.con) { dev =DEVICE (object_property_get_link (OBJECT (vd->dcl.con),"device" , &error_abort)); - info->has_display = true; info->display =g_strdup (dev->id); }for (i =0 ; vd->listener !=NULL && i < vd->listener->nsioc; i++) {
scripts/qapi/schema.py +0 -1
@@ -759,7 +759,6 @@ def need_has(self): assert self.type # Temporary hack to support dropping the has_FOO in reviewable chunks opt_out = [ - 'qapi/ui.json', 'qapi/virtio.json', 'qga/qapi-schema.json'] if self.info and any(self.info.fname.endswith(mod)
Signature · 1 line
2.37.3
PATCH v3 28/30 qapi virtio: Elide redundant has_FOO in generated C
In reply to Markus ArmbrusterThe has_FOO for pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundant has_FOO in generated C" provided the means to elide them step by step. This is the step for qapi/virtio.json.
Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here.
--- hw/virtio/virtio.c | 1 - monitor/hmp-cmds.c | 4 ++-- scripts/qapi/schema.py | 1 - 3 files changed, 2 insertions(+), 4 deletions(-)
hw/virtio/virtio.c +0 -1
@@ -4664,7 +4664,6 @@ VirtioStatus *qmp_x_query_virtio_status(const char *path, Error **errp) status->disable_legacy_check = vdev->disable_legacy_check; status->bus_name =g_strdup (vdev->bus_name); status->use_guest_notifier_mask = vdev->use_guest_notifier_mask; - status->has_vhost_dev = vdev->vhost_started;if (vdev->vhost_started) {VirtioDeviceClass *vdc =VIRTIO_DEVICE_GET_CLASS (vdev);
monitor/hmp-cmds.c +2 -2
@@ -2549,7 +2549,7 @@ void hmp_virtio_status(Monitor *mon, const QDict *qdict)monitor_printf (mon,"%s:\n" , path);monitor_printf (mon," device_name: %s %s\n" , - s->name, s->has_vhost_dev ?"(vhost)" :"" ); + s->name, s->vhost_dev ?"(vhost)" :"" );monitor_printf (mon," device_id: %d\n" , s->device_id);monitor_printf (mon," vhost_started: %s\n" , s->vhost_started ?"true" :"false" );
@@ -2585,7 +2585,7 @@ void hmp_virtio_status(Monitor *mon, const QDict *qdict)monitor_printf (mon," Backend features:\n" );hmp_virtio_dump_features (mon, s->backend_features); -if (s->has_vhost_dev) { +if (s->vhost_dev) {monitor_printf (mon," VHost:\n" );monitor_printf (mon," nvqs: %d\n" , s->vhost_dev->nvqs);
scripts/qapi/schema.py +0 -1
@@ -759,7 +759,6 @@ def need_has(self): assert self.type # Temporary hack to support dropping the has_FOO in reviewable chunks opt_out = [ - 'qapi/virtio.json', 'qga/qapi-schema.json'] if self.info and any(self.info.fname.endswith(mod) for mod in opt_out):
Signature · 1 line
2.37.3
PATCH v3 29/30 qapi qga: Elide redundant has_FOO in generated C
In reply to Markus ArmbrusterThe has_FOO for pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundant has_FOO in generated C" provided the means to elide them step by step. This is the step for qga/qapi-schema.json.
Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here.
--- qga/commands-posix.c | 32 ++++++++------------------------ qga/commands-win32.c | 40 +++++++--------------------------------- qga/commands.c | 11 ++++------- scripts/qapi/schema.py | 3 +-- 4 files changed, 20 insertions(+), 66 deletions(-)
qga/commands-posix.c +8 -24
@@ -71,7 +71,7 @@ static void ga_wait_child(pid_t pid, int *status, Error **errp)g_assert (rpid == pid); } -void qmp_guest_shutdown (bool has_mode,const char *mode,Error **errp) +void qmp_guest_shutdown (const char *mode,Error **errp) {const char *shutdown_flag;Error *local_err =NULL ;
@@ -93,7 +93,7 @@ void qmp_guest_shutdown(bool has_mode, const char *mode, Error **errp)#endif slog ("guest-shutdown called, mode: %s" , mode); -if (!has_mode ||strcmp (mode,"powerdown" ) ==0 ) { +if (!mode ||strcmp (mode,"powerdown" ) ==0 ) { shutdown_flag = powerdown_flag; }else if (strcmp (mode,"halt" ) ==0 ) { shutdown_flag = halt_flag;
@@ -404,14 +404,14 @@ end:return f; } -int64_t qmp_guest_file_open (const char *path,bool has_mode,const char *mode, +int64_t qmp_guest_file_open (const char *path,const char *mode,Error **errp) {FILE *fh;Error *local_err =NULL ;int64_t handle; -if (!has_mode) { +if (!mode) { mode ="r" ; }slog ("guest-file-open called, filepath: %s, mode: %s" , path, mode);
@@ -1037,7 +1037,6 @@ static bool build_guest_fsinfo_for_ccw_dev(char const *syspath,return false; } - disk->has_ccw_address = true; disk->ccw_address =g_new0 (GuestCCWAddress,1 ); disk->ccw_address->cssid = cssid; disk->ccw_address->ssid = ssid;
@@ -1084,12 +1083,10 @@ static void build_guest_fsinfo_for_real_device(char const *syspath, devnode =udev_device_get_devnode (udevice);if (devnode !=NULL ) { disk->dev =g_strdup (devnode); - disk->has_dev = true; } serial =udev_device_get_property_value (udevice,"ID_SERIAL" );if (serial !=NULL && *serial !=0 ) { disk->serial =g_strdup (serial); - disk->has_serial = true; } }
@@ -1108,7 +1105,7 @@ static void build_guest_fsinfo_for_real_device(char const *syspath, has_hwinf = false; } -if (has_hwinf || disk->has_dev || disk->has_serial) { +if (has_hwinf || disk->dev || disk->serial) {QAPI_LIST_PREPEND (fs->disk, disk); }else {qapi_free_GuestDiskAddress (disk);
@@ -1411,7 +1408,6 @@ static void get_nvme_smart(GuestDiskInfo *disk)return ; } - disk->has_smart = true; disk->smart =g_new0 (GuestDiskSmart,1 ); disk->smart->type =GUEST_DISK_BUS_TYPE_NVME ;
@@ -1449,7 +1445,7 @@ static void get_nvme_smart(GuestDiskInfo *disk)static void get_disk_smart (GuestDiskInfo *disk) { -if (disk->has_address +if (disk->address && (disk->address->bus_type ==GUEST_DISK_BUS_TYPE_NVME )) {get_nvme_smart (disk); }
@@ -1502,7 +1498,6 @@ GuestDiskInfoList *qmp_guest_get_disks(Error **errp) disk->name = dev_name; disk->partition = false; disk->alias =get_alias_for_syspath (disk_dir); - disk->has_alias = (disk->alias !=NULL );QAPI_LIST_PREPEND (ret, disk);/* Get address for non-virtual devices */
@@ -1522,8 +1517,6 @@ GuestDiskInfoList *qmp_guest_get_disks(Error **errp) error_get_pretty(local_err));error_free (local_err); local_err =NULL ; - }else if (disk->address !=NULL ) { - disk->has_address = true; } }
@@ -1641,7 +1634,6 @@ qmp_guest_fstrim(bool has_minimum, int64_t minimum, Error **errp)if (fd ==-1 ) { result->error =g_strdup_printf ("failed to open: %s" ,strerror (errno)); - result->has_error = true;continue ; }
@@ -1656,7 +1648,6 @@ qmp_guest_fstrim(bool has_minimum, int64_t minimum, Error **errp) r.minlen = has_minimum ? minimum :0 ; ret =ioctl (fd,FITRIM , &r);if (ret ==-1 ) { - result->has_error = true;if (errno ==ENOTTY || errno ==EOPNOTSUPP ) { result->error =g_strdup ("trim not supported" ); }else {
@@ -2967,7 +2958,7 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp)QAPI_LIST_APPEND (tail, info); } -if (!info->has_hardware_address) { +if (!info->hardware_address) {if (!guest_get_hw_addr (ifa, mac_addr, &obtained, errp)) { goto error; }
@@ -2977,7 +2968,6 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) (int ) mac_addr[0 ], (int ) mac_addr[1 ], (int ) mac_addr[2 ], (int ) mac_addr[3 ], (int) mac_addr[4], (int) mac_addr[5]); - info->has_hardware_address = true; } }
@@ -3037,14 +3027,12 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) info->has_ip_addresses = true; -if (!info->has_statistics) { +if (!info->statistics) { interface_stat =g_malloc0 (sizeof (*interface_stat));if (guest_get_network_stats (info->name, interface_stat) ==-1 ) { - info->has_statistics = false;g_free (interface_stat); }else { info->statistics = interface_stat; - info->has_statistics = true; } } }
@@ -3351,11 +3339,8 @@ GuestOSInfo *qmp_guest_get_osinfo(Error **errp)if (uname (&kinfo) !=0 ) {error_setg_errno (errp, errno,"uname failed" ); }else { - info->has_kernel_version = true; info->kernel_version =g_strdup (kinfo.version); - info->has_kernel_release = true; info->kernel_release =g_strdup (kinfo.release); - info->has_machine = true; info->machine =g_strdup (kinfo.machine); }
@@ -3375,7 +3360,6 @@ GuestOSInfo *qmp_guest_get_osinfo(Error **errp) value =g_key_file_get_value (osrelease,"os-release" , osfield,NULL ); \if (value !=NULL ) { \ga_osrelease_replace_special (value); \ - info->has_ ## field = true; \ info->field = value; \ } \ }while (0 )
qga/commands-win32.c +7 -33
@@ -193,8 +193,7 @@ static void handle_set_nonblocking(HANDLE fh)SetNamedPipeHandleState (fh, &pipe_state,NULL ,NULL ); } -int64_t qmp_guest_file_open (const char *path,bool has_mode, -const char *mode,Error **errp) +int64_t qmp_guest_file_open (const char *path,const char *mode,Error **errp) {int64_t fd =-1 ;HANDLE fh;
@@ -206,7 +205,7 @@ int64_t qmp_guest_file_open(const char *path, bool has_mode,GError *gerr =NULL ;wchar_t *w_path =NULL ; -if (!has_mode) { +if (!mode) { mode ="r" ; }slog ("guest-file-open called, filepath: %s, mode: %s" , path, mode);
@@ -317,14 +316,14 @@ static void execute_async(DWORD WINAPI (*func)(LPVOID), LPVOID opaque, } } -void qmp_guest_shutdown (bool has_mode,const char *mode,Error **errp) +void qmp_guest_shutdown (const char *mode,Error **errp) {Error *local_err =NULL ;UINT shutdown_flag =EWX_FORCE ;slog ("guest-shutdown called, mode: %s" , mode); -if (!has_mode ||strcmp (mode,"powerdown" ) ==0 ) { +if (!mode ||strcmp (mode,"powerdown" ) ==0 ) { shutdown_flag |=EWX_POWEROFF ; }else if (strcmp (mode,"halt" ) ==0 ) { shutdown_flag |=EWX_SHUTDOWN ;
@@ -833,7 +832,6 @@ static void get_disk_properties(HANDLE vol_h, GuestDiskAddress *disk,g_debug ("serial number \"%s\"" , serial);if (*serial !=0 ) { disk->serial =g_strndup (serial, len); - disk->has_serial = true; } } out_free:
@@ -951,7 +949,6 @@ static GuestDiskAddressList *build_guest_disk_info(char *guid, Error **errp)/* Possibly CD-ROM or a shared drive. Try to pass the volume */ g_debug ("volume not on disk" ); disk =g_new0 (GuestDiskAddress,1 ); - disk->has_dev = true; disk->dev =g_strdup (name);get_single_disk_info (0xffffffff , disk, &local_err);if (local_err) {
@@ -983,7 +980,6 @@ static GuestDiskAddressList *build_guest_disk_info(char *guid, Error **errp)* See also Naming Files, Paths and Namespaces: * https://docs.microsoft.com/en-us/windows/desktop/FileIO/naming-a-file#win32-device-namespaces */ - disk->has_dev = true; disk->dev =g_strdup_printf ("\\\\.\\PhysicalDrive%lu" , extents->Extents[i].DiskNumber);
@@ -1078,7 +1074,6 @@ GuestDiskInfoList *qmp_guest_get_disks(Error **errp)g_debug (" number: %lu" , sdn.DeviceNumber); address =g_new0 (GuestDiskAddress,1 ); - address->has_dev = true; address->dev =g_strdup (disk->name);get_single_disk_info (sdn.DeviceNumber, address, &local_err);if (local_err) {
@@ -1089,7 +1084,6 @@ GuestDiskInfoList *qmp_guest_get_disks(Error **errp) address =NULL ; }else { disk->address = address; - disk->has_address = true; }QAPI_LIST_PREPEND (ret, disk);
@@ -1369,7 +1363,6 @@ qmp_guest_fstrim(bool has_minimum, int64_t minimum, Error **errp)g_free (uc_path);if (!path) { - res->has_error = true; res->error =g_strdup (gerr->message);g_error_free (gerr);break ;
@@ -1387,7 +1380,6 @@ qmp_guest_fstrim(bool has_minimum, int64_t minimum, Error **errp)if (!g_spawn_sync (NULL , argv,NULL ,G_SPAWN_SEARCH_PATH ,NULL ,NULL , &out/* stdout */ ,NULL /* stdin */ ,NULL , &gerr)) { - res->has_error = true; res->error =g_strdup (gerr->message);g_error_free (gerr); }else {
@@ -1403,7 +1395,6 @@ qmp_guest_fstrim(bool has_minimum, int64_t minimum, Error **errp)if (g_strstr_len (lines[i],-1 ,"(0x" ) ==NULL ) {continue ; } - res->has_error = true; res->error =g_strdup (lines[i]);break ; }
@@ -1683,8 +1674,6 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) (int ) mac_addr[0 ], (int ) mac_addr[1 ], (int ) mac_addr[2 ], (int ) mac_addr[3 ], (int) mac_addr[4], (int) mac_addr[5]); - - info->has_hardware_address = true; } head_addr =NULL ;
@@ -1713,15 +1702,13 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) info->has_ip_addresses = true; info->ip_addresses = head_addr; } -if (!info->has_statistics) { +if (!info->statistics) { interface_stat =g_malloc0 (sizeof (*interface_stat)); -if (guest_get_network_stats (addr->AdapterName, - interface_stat) ==-1 ) { - info->has_statistics = false; +if (guest_get_network_stats (addr->AdapterName, interface_stat) + ==-1 ) {g_free (interface_stat); }else { info->statistics = interface_stat; - info->has_statistics = true; } } }
@@ -2113,7 +2100,6 @@ GuestUserList *qmp_guest_get_users(Error **errp) user->user =g_strdup (info->UserName); user->domain =g_strdup (info->Domain); - user->has_domain = true; user->login_time = login_time;
@@ -2332,29 +2318,19 @@ GuestOSInfo *qmp_guest_get_osinfo(Error **errp) info =g_new0 (GuestOSInfo,1 ); - info->has_kernel_version = true; info->kernel_version =g_strdup_printf ("%lu.%lu" , os_version.dwMajorVersion, os_version.dwMinorVersion); - info->has_kernel_release = true; info->kernel_release =g_strdup_printf ("%lu" , os_version.dwBuildNumber); - info->has_machine = true; info->machine =ga_get_current_arch (); - info->has_id = true; info->id =g_strdup ("mswindows" ); - info->has_name = true; info->name =g_strdup ("Microsoft Windows" ); - info->has_pretty_name = true; info->pretty_name = product_name; - info->has_version = true; info->version =ga_get_win_name (&os_version, false); - info->has_version_id = true; info->version_id =ga_get_win_name (&os_version, true); - info->has_variant = true; info->variant =g_strdup (server ?"server" :"client" ); - info->has_variant_id = true; info->variant_id =g_strdup (server ?"server" :"client" );return info;
@@ -2478,7 +2454,6 @@ GuestDeviceInfoList *qmp_guest_get_devices(Error **errp) device_id =g_match_info_fetch (match_info,2 ); device->id =g_new0 (GuestDeviceId,1 ); - device->has_id = true; device->id->type =GUEST_DEVICE_TYPE_PCI ; id = &device->id->u.pci; id->vendor_id =g_ascii_strtoull (vendor_id,NULL ,16 );
@@ -2502,7 +2477,6 @@ GuestDeviceInfoList *qmp_guest_get_devices(Error **errp)error_setg (errp,"conversion to utf8 failed (driver version)" );return NULL ; } - device->has_driver_version = true; date = (LPFILETIME )cm_get_property (dev_info_data.DevInst, &qga_DEVPKEY_Device_DriverDate, &cm_type);
qga/commands.c +4 -7
@@ -206,14 +206,12 @@ GuestExecStatus *qmp_guest_exec_status(int64_t pid, Error **errp) }#endif if (gei->out.length >0 ) { - ges->has_out_data = true; ges->out_data =g_base64_encode (gei->out.data, gei->out.length);g_free (gei->out.data); ges->has_out_truncated = gei->out.truncated; }if (gei->err.length >0 ) { - ges->has_err_data = true; ges->err_data =g_base64_encode (gei->err.data, gei->err.length);g_free (gei->err.data); ges->has_err_truncated = gei->err.truncated;
@@ -385,7 +383,7 @@ close:GuestExec *qmp_guest_exec (const char *path,bool has_arg,strList *arg,bool has_env,strList *env, -bool has_input_data,const char *input_data, +const char *input_data,bool has_capture_output,bool capture_output,Error **errp) {
@@ -406,7 +404,7 @@ GuestExec *qmp_guest_exec(const char *path, arglist.value = (char *)path; arglist.next = has_arg ? arg :NULL ; -if (has_input_data) { +if (input_data) { input =qbase64_decode (input_data,-1 , &ninput, errp);if (!input) {return NULL ;
@@ -423,7 +421,7 @@ GuestExec *qmp_guest_exec(const char *path, } ret =g_spawn_async_with_pipes (NULL , argv, envp, flags, - guest_exec_task_setup,NULL , &pid, has_input_data ? &in_fd :NULL , + guest_exec_task_setup,NULL , &pid, input_data ? &in_fd :NULL , has_output ? &out_fd :NULL , has_output ? &err_fd :NULL , &gerr);if (!ret) {error_setg (errp,QERR_QGA_COMMAND_FAILED , gerr->message);
@@ -438,7 +436,7 @@ GuestExec *qmp_guest_exec(const char *path, gei->has_output = has_output;g_child_watch_add (pid, guest_exec_child_watch, gei); -if (has_input_data) { +if (input_data) { gei->in.data =g_steal_pointer (&input); gei->in.size = ninput;#ifdef G_OS_WIN32
@@ -547,7 +545,6 @@ GuestTimezone *qmp_guest_get_timezone(Error **errp) info->offset =g_time_zone_get_offset (tz, intv); name =g_time_zone_get_abbreviation (tz, intv);if (name !=NULL ) { - info->has_zone = true; info->zone =g_strdup (name); }g_time_zone_unref (tz);
scripts/qapi/schema.py +1 -2
@@ -758,8 +758,7 @@ def __init__(self, name, info, typ, optional, ifcond=None, features=None): def need_has(self): assert self.type # Temporary hack to support dropping the has_FOO in reviewable chunks - opt_out = [ - 'qga/qapi-schema.json'] + opt_out = [] if self.info and any(self.info.fname.endswith(mod) for mod in opt_out): return self.optional
Signature · 1 line
2.37.3
Re: [PATCH v3 29/30] qapi qga: Elide redundant has_FOO in generated C
Quoted 20 lines · Markus Armbruster
The
has_FOOfor pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundanthas_FOOin generated C" provided the means to elide them step by step. This is the step forqga/qapi-schema.json.Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here.
Cc Michael Roth <[email protected]>Cc Konstantin Kostiuk <[email protected]>Signed-off-by Markus Armbruster <[email protected]>--- qga/commands-posix.c | 32 ++++++++------------------------ qga/commands-win32.c | 40 +++++++--------------------------------- qga/commands.c | 11 ++++------- scripts/qapi/schema.py | 3 +-- 4 files changed, 20 insertions(+), 66 deletions(-)qga/commands-posix.c +1
-1-int64_t qmp_guest_file_open(const char *path, bool has_mode, const char *mode, +int64_t qmp_guest_file_open(const char *path, const char *mode,
qga/commands-posix.c end: · line 416
Quoted 10 lines
qga/commands-posix.c +1
-1Error **errp) {FILE *fh;Error *local_err =NULL ;int64_t handle; -if (!has_mode) { +if (!mode) { mode ="r" ; }
PATCH v3 30/30 qapi: Drop temporary logic to support conversion step by step
In reply to Markus Armbruster--- scripts/qapi/schema.py | 6 ------ 1 file changed, 6 deletions(-)
scripts/qapi/schema.py +0 -6
@@ -757,12 +757,6 @@ def __init__(self, name, info, typ, optional, ifcond=None, features=None): def need_has(self): assert self.type - # Temporary hack to support dropping the has_FOO in reviewable chunks - opt_out = [] - if self.info and any(self.info.fname.endswith(mod) - for mod in opt_out): - return self.optional - # End of temporary hack return self.optional and self.type.need_has_if_optional() def check(self, schema):
Signature · 1 line
2.37.3
Quoted 27 lines · Markus Armbruster
In QAPI, absent optional members are distinct from any present value. We thus represent an optional schema member FOO as two C members: a FOO with the member's type, and a bool
has_FOO. Likewise for function arguments.However, the
has_FOOis actually redundant for a pointer-valued FOO, which can be null only whenhas_FOOis false, i.e.has_FOO== !!FOO. Except for arrays, where we a null FOO can also be a present empty array.The redundant
has_FOOare a nuisance to work with. Improve the generator to elide them.PATCH 01+02 are trivial documentation cleanups.
PATCH 03 tweaks an example in documentation so it'll show the change.
PATCH 04 improves the code generator, but nerfs the change for the schema modules where handwritten code needs to be updated.
PATCH 05-07,10-29 un-nerf in reviewable chunks. Their commit messages refer back to PATCH 04 for an explanation of the transformation. Please read that first. Note that these patches combine the mechanical transformation with obvious, local follow-up simplifications. If you want them separate for easier review, let me know.
Quoted 3 lines
PATCH 08+09 clean up in preparation for PATCH 10.
PATCH 28 drops the nerfing code.
PATCH 30, of course.