| Message ID | 20191011085027.28606-4-armbru@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | qapi: Add detection for the 'savevm' fix for blockdev | expand |
Markus Armbruster <armbru@redhat.com> writes: > From: Peter Krempa <pkrempa@redhat.com> > > Signed-off-by: Peter Krempa <pkrempa@redhat.com> > Reviewed-by: Markus Armbruster <armbru@redhat.com> > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > tests/test-qmp-cmds.c | 24 ++++++++++++++++++++++++ > tests/qapi-schema/qapi-schema-test.json | 22 ++++++++++++++++++++++ > tests/qapi-schema/qapi-schema-test.out | 23 +++++++++++++++++++++++ > tests/qapi-schema/test-qapi.py | 12 ++++++++---- > 4 files changed, 77 insertions(+), 4 deletions(-) > > diff --git a/tests/test-qmp-cmds.c b/tests/test-qmp-cmds.c > index 36fdf5b115..ba623fda29 100644 > --- a/tests/test-qmp-cmds.c > +++ b/tests/test-qmp-cmds.c > @@ -51,6 +51,30 @@ void qmp_test_features(FeatureStruct0 *fs0, FeatureStruct1 *fs1, > { > } > > +void qmp_test_command_features1(Error **errp) > +{ > +} > + > +void qmp_test_command_features2(Error **errp) > +{ > +} > + > +void qmp_test_command_features3(Error **errp) > +{ > +} > + > +void qmp_test_command_features4(Error **errp) > +{ > +} > + > +void qmp_test_command_features5(Error **errp) > +{ > +} > + > +void qmp_test_command_features6(Error **errp) > +{ > +} > + > UserDefTwo *qmp_user_def_cmd2(UserDefOne *ud1a, > bool has_udb1, UserDefOne *ud1b, > Error **errp) > diff --git a/tests/qapi-schema/qapi-schema-test.json b/tests/qapi-schema/qapi-schema-test.json > index 75c42eb0e3..80811dc8f0 100644 > --- a/tests/qapi-schema/qapi-schema-test.json > +++ b/tests/qapi-schema/qapi-schema-test.json > @@ -290,3 +290,25 @@ > 'cfs1': 'CondFeatureStruct1', > 'cfs2': 'CondFeatureStruct2', > 'cfs3': 'CondFeatureStruct3' } } > + > +# test 'features' for command > + > +{ 'command': 'test-command-features1', > + 'features': [] } > + > +{ 'command': 'test-command-features2', > + 'features': [ 'feature1' ] } > + > +{ 'command': 'test-command-features3', > + 'features': [ 'feature1', 'feature2' ] } > + > +{ 'command': 'test-command-features4', > + 'features': [ { 'name': 'feature1', 'if': 'defined(TEST_IF_FEATURE_1)'} ] } > + > +{ 'command': 'test-command-features5', > + 'features': [ { 'name': 'feature1', 'if': 'defined(TEST_IF_FEATURE_1)'}, > + { 'name': 'feature2', 'if': 'defined(TEST_IF_FEATURE_2)'} ] } > + > +{ 'command': 'test-command-features6', > + 'features': [ { 'name': 'feature1', 'if': [ 'defined(TEST_IF_COND_1)', > + 'defined(TEST_IF_COND_2)'] } ] } > diff --git a/tests/qapi-schema/qapi-schema-test.out b/tests/qapi-schema/qapi-schema-test.out > index aca43186a9..4061152cae 100644 > --- a/tests/qapi-schema/qapi-schema-test.out > +++ b/tests/qapi-schema/qapi-schema-test.out > @@ -412,3 +412,26 @@ object q_obj_test-features-arg > member cfs3: CondFeatureStruct3 optional=False > command test-features q_obj_test-features-arg -> None > gen=True success_response=True boxed=False oob=False preconfig=False > +command test-command-features1 None -> None > + gen=True success_response=True boxed=False oob=False preconfig=False > +command test-command-features2 None -> None > + gen=True success_response=True boxed=False oob=False preconfig=False > + feature feature1 > +command test-command-features3 None -> None > + gen=True success_response=True boxed=False oob=False preconfig=False > + feature feature1 > + feature feature2 > +command test-command-features4 None -> None > + gen=True success_response=True boxed=False oob=False preconfig=False > + feature feature1 > + if ['defined(TEST_IF_FEATURE_1)'] > +command test-command-features5 None -> None > + gen=True success_response=True boxed=False oob=False preconfig=False > + feature feature1 > + if ['defined(TEST_IF_FEATURE_1)'] > + feature feature2 > + if ['defined(TEST_IF_FEATURE_2)'] > +command test-command-features6 None -> None > + gen=True success_response=True boxed=False oob=False preconfig=False > + feature feature1 > + if ['defined(TEST_IF_COND_1)', 'defined(TEST_IF_COND_2)'] This might border on OCD... Your new tests for commands are patterned after the existing tests for structs. You omit a few, and that's okay. I'd like the names of corresponding tests to match; see appended incremental patch. [...] diff --git a/tests/test-qmp-cmds.c b/tests/test-qmp-cmds.c index ba623fda29..27b0afe55a 100644 --- a/tests/test-qmp-cmds.c +++ b/tests/test-qmp-cmds.c @@ -51,27 +51,27 @@ void qmp_test_features(FeatureStruct0 *fs0, FeatureStruct1 *fs1, { } +void qmp_test_command_features0(Error **errp) +{ +} + void qmp_test_command_features1(Error **errp) { } -void qmp_test_command_features2(Error **errp) -{ -} - void qmp_test_command_features3(Error **errp) { } -void qmp_test_command_features4(Error **errp) +void qmp_test_command_cond_features1(Error **errp) { } -void qmp_test_command_features5(Error **errp) +void qmp_test_command_cond_features2(Error **errp) { } -void qmp_test_command_features6(Error **errp) +void qmp_test_command_cond_features3(Error **errp) { } diff --git a/tests/qapi-schema/qapi-schema-test.json b/tests/qapi-schema/qapi-schema-test.json index 80811dc8f0..9abf175fe0 100644 --- a/tests/qapi-schema/qapi-schema-test.json +++ b/tests/qapi-schema/qapi-schema-test.json @@ -293,22 +293,18 @@ # test 'features' for command +{ 'command': 'test-command-features0', + 'features': [] } { 'command': 'test-command-features1', - 'features': [] } - -{ 'command': 'test-command-features2', 'features': [ 'feature1' ] } - { 'command': 'test-command-features3', 'features': [ 'feature1', 'feature2' ] } -{ 'command': 'test-command-features4', +{ 'command': 'test-command-cond-features1', 'features': [ { 'name': 'feature1', 'if': 'defined(TEST_IF_FEATURE_1)'} ] } - -{ 'command': 'test-command-features5', +{ 'command': 'test-command-cond-features2', 'features': [ { 'name': 'feature1', 'if': 'defined(TEST_IF_FEATURE_1)'}, { 'name': 'feature2', 'if': 'defined(TEST_IF_FEATURE_2)'} ] } - -{ 'command': 'test-command-features6', +{ 'command': 'test-command-cond-features3', 'features': [ { 'name': 'feature1', 'if': [ 'defined(TEST_IF_COND_1)', 'defined(TEST_IF_COND_2)'] } ] } diff --git a/tests/qapi-schema/qapi-schema-test.out b/tests/qapi-schema/qapi-schema-test.out index 4061152cae..3660e75a48 100644 --- a/tests/qapi-schema/qapi-schema-test.out +++ b/tests/qapi-schema/qapi-schema-test.out @@ -412,26 +412,26 @@ object q_obj_test-features-arg member cfs3: CondFeatureStruct3 optional=False command test-features q_obj_test-features-arg -> None gen=True success_response=True boxed=False oob=False preconfig=False +command test-command-features0 None -> None + gen=True success_response=True boxed=False oob=False preconfig=False command test-command-features1 None -> None gen=True success_response=True boxed=False oob=False preconfig=False -command test-command-features2 None -> None - gen=True success_response=True boxed=False oob=False preconfig=False feature feature1 command test-command-features3 None -> None gen=True success_response=True boxed=False oob=False preconfig=False feature feature1 feature feature2 -command test-command-features4 None -> None +command test-command-cond-features1 None -> None gen=True success_response=True boxed=False oob=False preconfig=False feature feature1 if ['defined(TEST_IF_FEATURE_1)'] -command test-command-features5 None -> None +command test-command-cond-features2 None -> None gen=True success_response=True boxed=False oob=False preconfig=False feature feature1 if ['defined(TEST_IF_FEATURE_1)'] feature feature2 if ['defined(TEST_IF_FEATURE_2)'] -command test-command-features6 None -> None +command test-command-cond-features3 None -> None gen=True success_response=True boxed=False oob=False preconfig=False feature feature1 if ['defined(TEST_IF_COND_1)', 'defined(TEST_IF_COND_2)']
diff --git a/tests/test-qmp-cmds.c b/tests/test-qmp-cmds.c index 36fdf5b115..ba623fda29 100644 --- a/tests/test-qmp-cmds.c +++ b/tests/test-qmp-cmds.c @@ -51,6 +51,30 @@ void qmp_test_features(FeatureStruct0 *fs0, FeatureStruct1 *fs1, { } +void qmp_test_command_features1(Error **errp) +{ +} + +void qmp_test_command_features2(Error **errp) +{ +} + +void qmp_test_command_features3(Error **errp) +{ +} + +void qmp_test_command_features4(Error **errp) +{ +} + +void qmp_test_command_features5(Error **errp) +{ +} + +void qmp_test_command_features6(Error **errp) +{ +} + UserDefTwo *qmp_user_def_cmd2(UserDefOne *ud1a, bool has_udb1, UserDefOne *ud1b, Error **errp) diff --git a/tests/qapi-schema/qapi-schema-test.json b/tests/qapi-schema/qapi-schema-test.json index 75c42eb0e3..80811dc8f0 100644 --- a/tests/qapi-schema/qapi-schema-test.json +++ b/tests/qapi-schema/qapi-schema-test.json @@ -290,3 +290,25 @@ 'cfs1': 'CondFeatureStruct1', 'cfs2': 'CondFeatureStruct2', 'cfs3': 'CondFeatureStruct3' } } + +# test 'features' for command + +{ 'command': 'test-command-features1', + 'features': [] } + +{ 'command': 'test-command-features2', + 'features': [ 'feature1' ] } + +{ 'command': 'test-command-features3', + 'features': [ 'feature1', 'feature2' ] } + +{ 'command': 'test-command-features4', + 'features': [ { 'name': 'feature1', 'if': 'defined(TEST_IF_FEATURE_1)'} ] } + +{ 'command': 'test-command-features5', + 'features': [ { 'name': 'feature1', 'if': 'defined(TEST_IF_FEATURE_1)'}, + { 'name': 'feature2', 'if': 'defined(TEST_IF_FEATURE_2)'} ] } + +{ 'command': 'test-command-features6', + 'features': [ { 'name': 'feature1', 'if': [ 'defined(TEST_IF_COND_1)', + 'defined(TEST_IF_COND_2)'] } ] } diff --git a/tests/qapi-schema/qapi-schema-test.out b/tests/qapi-schema/qapi-schema-test.out index aca43186a9..4061152cae 100644 --- a/tests/qapi-schema/qapi-schema-test.out +++ b/tests/qapi-schema/qapi-schema-test.out @@ -412,3 +412,26 @@ object q_obj_test-features-arg member cfs3: CondFeatureStruct3 optional=False command test-features q_obj_test-features-arg -> None gen=True success_response=True boxed=False oob=False preconfig=False +command test-command-features1 None -> None + gen=True success_response=True boxed=False oob=False preconfig=False +command test-command-features2 None -> None + gen=True success_response=True boxed=False oob=False preconfig=False + feature feature1 +command test-command-features3 None -> None + gen=True success_response=True boxed=False oob=False preconfig=False + feature feature1 + feature feature2 +command test-command-features4 None -> None + gen=True success_response=True boxed=False oob=False preconfig=False + feature feature1 + if ['defined(TEST_IF_FEATURE_1)'] +command test-command-features5 None -> None + gen=True success_response=True boxed=False oob=False preconfig=False + feature feature1 + if ['defined(TEST_IF_FEATURE_1)'] + feature feature2 + if ['defined(TEST_IF_FEATURE_2)'] +command test-command-features6 None -> None + gen=True success_response=True boxed=False oob=False preconfig=False + feature feature1 + if ['defined(TEST_IF_COND_1)', 'defined(TEST_IF_COND_2)'] diff --git a/tests/qapi-schema/test-qapi.py b/tests/qapi-schema/test-qapi.py index d31ac4bbb7..32333d3bf9 100755 --- a/tests/qapi-schema/test-qapi.py +++ b/tests/qapi-schema/test-qapi.py @@ -61,10 +61,7 @@ class QAPISchemaTestVisitor(QAPISchemaVisitor): self._print_if(m.ifcond, 8) self._print_variants(variants) self._print_if(ifcond) - if features: - for f in features: - print(' feature %s' % f.name) - self._print_if(f.ifcond, 8) + self._print_features(features) def visit_alternate_type(self, name, info, ifcond, variants): print('alternate %s' % name) @@ -80,6 +77,7 @@ class QAPISchemaTestVisitor(QAPISchemaVisitor): print(' gen=%s success_response=%s boxed=%s oob=%s preconfig=%s' % (gen, success_response, boxed, allow_oob, allow_preconfig)) self._print_if(ifcond) + self._print_features(features) def visit_event(self, name, info, ifcond, arg_type, boxed): print('event %s %s' % (name, arg_type and arg_type.name)) @@ -99,6 +97,12 @@ class QAPISchemaTestVisitor(QAPISchemaVisitor): if ifcond: print('%sif %s' % (' ' * indent, ifcond)) + @classmethod + def _print_features(cls, features): + if features: + for f in features: + print(' feature %s' % f.name) + cls._print_if(f.ifcond, 8) def test_frontend(fname): schema = QAPISchema(fname)