On 09/16/2015 05:06 AM, Markus Armbruster wrote: > Duplicated in commit 21cd70d. Yes, we can't import qapi-types, but > that's no excuse. Move the helpers from qapi-types.py to qapi.py, and > replace the duplicates in qapi-event.py. > > The generated event enumeration type's lookup table becomes > const-correct (see commit 2e4450f), and uses explicit indexes instead > of relying on order (see commit 912ae9c). > > Signed-off-by: Markus Armbruster <arm...@redhat.com> > --- > docs/qapi-code-gen.txt | 9 ++++--- > scripts/qapi-event.py | 67 > +++----------------------------------------------- > scripts/qapi-types.py | 55 ----------------------------------------- > scripts/qapi.py | 55 +++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 64 insertions(+), 122 deletions(-) >
> +++ b/scripts/qapi.py > @@ -1497,6 +1497,61 @@ def guardend(name): > ''', > name=guardname(name)) > > +def generate_enum_lookup(name, values, prefix=None): To keep pep8 happier, you could use two blank lines before def here... > + return ret > + > +def generate_enum(name, values, prefix=None): and here. Then again, 13/26 does more of these sorts of cleanups, and v7 had the same use of 1 blank line. Up to you if it is worth avoiding the churn; but it is whitespace either way so it doesn't affect review. Also, do you still need prefix=None, or can we rely on the fact that now all callers supply prefix by virtue of the visitor callback, and make the parameter non-optional? Reviewed-by: Eric Blake <ebl...@redhat.com> -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
