+3 -3

scripts/qapi/commands.py

··· 283 283 prefix=self._prefix)) 284 284 self._genc.add(gen_registry(self._regy.get_content(), self._prefix)) 285 285 286 286 - def visit_command(self, name, info, ifcond, arg_type, ret_type, gen, 287 287 - success_response, boxed, allow_oob, allow_preconfig, 288 288 - features): 286 286 + def visit_command(self, name, info, ifcond, features, 287 287 + arg_type, ret_type, gen, success_response, boxed, 288 288 + allow_oob, allow_preconfig): 289 289 if not gen: 290 290 return 291 291 # FIXME: If T is a user-defined type, the user is responsible

+5 -5

scripts/qapi/doc.py

··· 249 249 texi_members(doc, 'Values', 250 250 member_func=texi_enum_value))) 251 251 252 252 - def visit_object_type(self, name, info, ifcond, base, members, variants, 253 253 - features): 252 252 + def visit_object_type(self, name, info, ifcond, features, 253 253 + base, members, variants): 254 254 doc = self.cur_doc 255 255 if base and base.is_implicit(): 256 256 base = None ··· 262 262 self._gen.add(texi_type('Alternate', doc, ifcond, 263 263 texi_members(doc, 'Members'))) 264 264 265 265 - def visit_command(self, name, info, ifcond, arg_type, ret_type, gen, 266 266 - success_response, boxed, allow_oob, allow_preconfig, 267 267 - features): 265 265 + def visit_command(self, name, info, ifcond, features, 266 266 + arg_type, ret_type, gen, success_response, boxed, 267 267 + allow_oob, allow_preconfig): 268 268 doc = self.cur_doc 269 269 self._gen.add(texi_msg('Command', doc, ifcond, 270 270 texi_arguments(doc,

+5 -5

scripts/qapi/introspect.py

··· 193 193 self._gen_qlit('[' + element + ']', 'array', {'element-type': element}, 194 194 ifcond, None) 195 195 196 196 - def visit_object_type_flat(self, name, info, ifcond, members, variants, 197 197 - features): 196 196 + def visit_object_type_flat(self, name, info, ifcond, features, 197 197 + members, variants): 198 198 obj = {'members': [self._gen_member(m) for m in members]} 199 199 if variants: 200 200 obj.update(self._gen_variants(variants.tag_member.name, ··· 209 209 for m in variants.variants]}, 210 210 ifcond, features) 211 211 212 212 - def visit_command(self, name, info, ifcond, arg_type, ret_type, gen, 213 213 - success_response, boxed, allow_oob, allow_preconfig, 214 214 - features): 212 212 + def visit_command(self, name, info, ifcond, features, 213 213 + arg_type, ret_type, gen, success_response, boxed, 214 214 + allow_oob, allow_preconfig): 215 215 arg_type = arg_type or self._schema.the_empty_object_type 216 216 ret_type = ret_type or self._schema.the_empty_object_type 217 217 obj = {'arg-type': self._use_type(arg_type),

+17 -19

scripts/qapi/schema.py

··· 115 115 def visit_array_type(self, name, info, ifcond, element_type): 116 116 pass 117 117 118 118 - def visit_object_type(self, name, info, ifcond, base, members, variants, 119 119 - features): 118 118 + def visit_object_type(self, name, info, ifcond, features, 119 119 + base, members, variants): 120 120 pass 121 121 122 122 - def visit_object_type_flat(self, name, info, ifcond, members, variants, 123 123 - features): 122 122 + def visit_object_type_flat(self, name, info, ifcond, features, 123 123 + members, variants): 124 124 pass 125 125 126 126 def visit_alternate_type(self, name, info, ifcond, features, variants): 127 127 pass 128 128 129 129 - def visit_command(self, name, info, ifcond, arg_type, ret_type, gen, 130 130 - success_response, boxed, allow_oob, allow_preconfig, 131 131 - features): 129 129 + def visit_command(self, name, info, ifcond, features, 130 130 + arg_type, ret_type, gen, success_response, boxed, 131 131 + allow_oob, allow_preconfig): 132 132 pass 133 133 134 134 def visit_event(self, name, info, ifcond, features, arg_type, boxed): ··· 436 436 437 437 def visit(self, visitor): 438 438 super().visit(visitor) 439 439 - visitor.visit_object_type(self.name, self.info, self.ifcond, 440 440 - self.base, self.local_members, self.variants, 441 441 - self.features) 442 442 - visitor.visit_object_type_flat(self.name, self.info, self.ifcond, 443 443 - self.members, self.variants, 444 444 - self.features) 439 439 + visitor.visit_object_type( 440 440 + self.name, self.info, self.ifcond, self.features, 441 441 + self.base, self.local_members, self.variants) 442 442 + visitor.visit_object_type_flat( 443 443 + self.name, self.info, self.ifcond, self.features, 444 444 + self.members, self.variants) 445 445 446 446 447 447 class QAPISchemaMember: ··· 745 745 746 746 def visit(self, visitor): 747 747 super().visit(visitor) 748 748 - visitor.visit_command(self.name, self.info, self.ifcond, 749 749 - self.arg_type, self.ret_type, 750 750 - self.gen, self.success_response, 751 751 - self.boxed, self.allow_oob, 752 752 - self.allow_preconfig, 753 753 - self.features) 748 748 + visitor.visit_command( 749 749 + self.name, self.info, self.ifcond, self.features, 750 750 + self.arg_type, self.ret_type, self.gen, self.success_response, 751 751 + self.boxed, self.allow_oob, self.allow_preconfig) 754 752 755 753 756 754 class QAPISchemaEvent(QAPISchemaEntity):

+2 -2

scripts/qapi/types.py

··· 289 289 self._genh.add(gen_array(name, element_type)) 290 290 self._gen_type_cleanup(name) 291 291 292 292 - def visit_object_type(self, name, info, ifcond, base, members, variants, 293 293 - features): 292 292 + def visit_object_type(self, name, info, ifcond, features, 293 293 + base, members, variants): 294 294 # Nothing to do for the special empty builtin 295 295 if name == 'q_empty': 296 296 return

+2 -2

scripts/qapi/visit.py

··· 326 326 self._genh.add(gen_visit_decl(name)) 327 327 self._genc.add(gen_visit_list(name, element_type)) 328 328 329 329 - def visit_object_type(self, name, info, ifcond, base, members, variants, 330 330 - features): 329 329 + def visit_object_type(self, name, info, ifcond, features, 330 330 + base, members, variants): 331 331 # Nothing to do for the special empty builtin 332 332 if name == 'q_empty': 333 333 return

+5 -5

tests/qapi-schema/test-qapi.py

··· 46 46 print('array %s %s' % (name, element_type.name)) 47 47 self._print_if(ifcond) 48 48 49 49 - def visit_object_type(self, name, info, ifcond, base, members, variants, 50 50 - features): 49 49 + def visit_object_type(self, name, info, ifcond, features, 50 50 + base, members, variants): 51 51 print('object %s' % name) 52 52 if base: 53 53 print(' base %s' % base.name) ··· 65 65 self._print_if(ifcond) 66 66 self._print_features(features) 67 67 68 68 - def visit_command(self, name, info, ifcond, arg_type, ret_type, gen, 69 69 - success_response, boxed, allow_oob, allow_preconfig, 70 70 - features): 68 68 + def visit_command(self, name, info, ifcond, features, 69 69 + arg_type, ret_type, gen, success_response, boxed, 70 70 + allow_oob, allow_preconfig): 71 71 print('command %s %s -> %s' 72 72 % (name, arg_type and arg_type.name, 73 73 ret_type and ret_type.name))