On 12/02/2015 04:51 AM, Markus Armbruster wrote: > This is the fixup I mentioned in the v13 thread. The "Unreachable and > not implemented" hunk should probably be its own patch.
In fact, that hunk...
>
> diff --git a/scripts/qapi.py b/scripts/qapi.py
> index 6d38d7c..870e476 100644
> --- a/scripts/qapi.py
> +++ b/scripts/qapi.py
> @@ -1073,7 +1071,8 @@ class QAPISchemaMember(object):
> return '(parameter of %s)' % owner[:-4]
> else:
> assert owner.endswith('-wrapper')
> - return '(branch of %s)' % owner[:-8]
> + # Unreachable and not implemented
> + assert False
> if owner.endswith('Kind'):
> # See QAPISchema._make_implicit_enum_type()
> return '(branch of %s)' % owner[:-4]
...should probably just be squashed directly into commit 8f3a05b on your
current qapi-next branch, since it hasn't landed upstream yet.
Your fixup looks sane, and eliminates the need for 12/15. So I'm fine
if you'd like to make that change when updating qapi-next.
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
