+39

tests/qapi-schema/qapi-schema-test.json

··· 242 242 { 'foo': 'TestIfStruct', 243 243 'bar': { 'type': ['TestIfEnum'], 'if': 'defined(TEST_IF_EVT_BAR)' } }, 244 244 'if': 'defined(TEST_IF_EVT) && defined(TEST_IF_STRUCT)' } 245 245 + 246 246 + # test 'features' for structs 247 247 + 248 248 + { 'struct': 'FeatureStruct0', 249 249 + 'data': { 'foo': 'int' }, 250 250 + 'features': [] } 251 251 + { 'struct': 'FeatureStruct1', 252 252 + 'data': { 'foo': 'int' }, 253 253 + 'features': [ 'feature1' ] } 254 254 + { 'struct': 'FeatureStruct2', 255 255 + 'data': { 'foo': 'int' }, 256 256 + 'features': [ { 'name': 'feature1' } ] } 257 257 + { 'struct': 'FeatureStruct3', 258 258 + 'data': { 'foo': 'int' }, 259 259 + 'features': [ 'feature1', 'feature2' ] } 260 260 + { 'struct': 'FeatureStruct4', 261 261 + 'data': { 'namespace-test': 'int' }, 262 262 + 'features': [ 'namespace-test', 'int', 'name', 'if' ] } 263 263 + 264 264 + { 'struct': 'CondFeatureStruct1', 265 265 + 'data': { 'foo': 'int' }, 266 266 + 'features': [ { 'name': 'feature1', 'if': 'defined(TEST_IF_FEATURE_1)'} ] } 267 267 + { 'struct': 'CondFeatureStruct2', 268 268 + 'data': { 'foo': 'int' }, 269 269 + 'features': [ { 'name': 'feature1', 'if': 'defined(TEST_IF_FEATURE_1)'}, 270 270 + { 'name': 'feature2', 'if': 'defined(TEST_IF_FEATURE_2)'} ] } 271 271 + { 'struct': 'CondFeatureStruct3', 272 272 + 'data': { 'foo': 'int' }, 273 273 + 'features': [ { 'name': 'feature1', 'if': [ 'defined(TEST_IF_COND_1)', 274 274 + 'defined(TEST_IF_COND_2)'] } ] } 275 275 + { 'command': 'test-features', 276 276 + 'data': { 'fs0': 'FeatureStruct0', 277 277 + 'fs1': 'FeatureStruct1', 278 278 + 'fs2': 'FeatureStruct2', 279 279 + 'fs3': 'FeatureStruct3', 280 280 + 'fs4': 'FeatureStruct4', 281 281 + 'cfs1': 'CondFeatureStruct1', 282 282 + 'cfs2': 'CondFeatureStruct2', 283 283 + 'cfs3': 'CondFeatureStruct3' } }

+43

tests/qapi-schema/qapi-schema-test.out

··· 354 354 event TestIfEvent q_obj_TestIfEvent-arg 355 355 boxed=False 356 356 if ['defined(TEST_IF_EVT) && defined(TEST_IF_STRUCT)'] 357 357 + object FeatureStruct0 358 358 + member foo: int optional=False 359 359 + object FeatureStruct1 360 360 + member foo: int optional=False 361 361 + feature feature1 362 362 + object FeatureStruct2 363 363 + member foo: int optional=False 364 364 + feature feature1 365 365 + object FeatureStruct3 366 366 + member foo: int optional=False 367 367 + feature feature1 368 368 + feature feature2 369 369 + object FeatureStruct4 370 370 + member namespace-test: int optional=False 371 371 + feature namespace-test 372 372 + feature int 373 373 + feature name 374 374 + feature if 375 375 + object CondFeatureStruct1 376 376 + member foo: int optional=False 377 377 + feature feature1 378 378 + if ['defined(TEST_IF_FEATURE_1)'] 379 379 + object CondFeatureStruct2 380 380 + member foo: int optional=False 381 381 + feature feature1 382 382 + if ['defined(TEST_IF_FEATURE_1)'] 383 383 + feature feature2 384 384 + if ['defined(TEST_IF_FEATURE_2)'] 385 385 + object CondFeatureStruct3 386 386 + member foo: int optional=False 387 387 + feature feature1 388 388 + if ['defined(TEST_IF_COND_1)', 'defined(TEST_IF_COND_2)'] 389 389 + object q_obj_test-features-arg 390 390 + member fs0: FeatureStruct0 optional=False 391 391 + member fs1: FeatureStruct1 optional=False 392 392 + member fs2: FeatureStruct2 optional=False 393 393 + member fs3: FeatureStruct3 optional=False 394 394 + member fs4: FeatureStruct4 optional=False 395 395 + member cfs1: CondFeatureStruct1 optional=False 396 396 + member cfs2: CondFeatureStruct2 optional=False 397 397 + member cfs3: CondFeatureStruct3 optional=False 398 398 + command test-features q_obj_test-features-arg -> None 399 399 + gen=True success_response=True boxed=False oob=False preconfig=False

+4

tests/qapi-schema/test-qapi.py

··· 49 49 self._print_if(m.ifcond, 8) 50 50 self._print_variants(variants) 51 51 self._print_if(ifcond) 52 52 + if features: 53 53 + for f in features: 54 54 + print(' feature %s' % f.name) 55 55 + self._print_if(f.ifcond, 8) 52 56 53 57 def visit_alternate_type(self, name, info, ifcond, variants): 54 58 print('alternate %s' % name)

+8

tests/test-qmp-cmds.c

··· 43 43 { 44 44 } 45 45 46 46 + void qmp_test_features(FeatureStruct0 *fs0, FeatureStruct1 *fs1, 47 47 + FeatureStruct2 *fs2, FeatureStruct3 *fs3, 48 48 + FeatureStruct4 *fs4, CondFeatureStruct1 *cfs1, 49 49 + CondFeatureStruct2 *cfs2, CondFeatureStruct3 *cfs3, 50 50 + Error **errp) 51 51 + { 52 52 + } 53 53 + 46 54 UserDefTwo *qmp_user_def_cmd2(UserDefOne *ud1a, 47 55 bool has_udb1, UserDefOne *ud1b, 48 56 Error **errp)