On 04/28/2015 02:41 AM, Markus Armbruster wrote: > Eric Blake <[email protected]> writes: > >> Previous patches have led up to the point where I create the >> new meta-type "'alternate':'Foo'". See the previous patches >> for documentation; I intentionally split as much work into >> earlier patches to minimize the size of this patch, but a lot >> of it is churn due to testsuite fallout after updating to the >> new type. >> >> Signed-off-by: Eric Blake <[email protected]> > [...] >> diff --git a/tests/qapi-schema/flat-union-base-union.json >> b/tests/qapi-schema/flat-union-base-union.json >> index 838986c..0ba6e28 100644 >> --- a/tests/qapi-schema/flat-union-base-union.json >> +++ b/tests/qapi-schema/flat-union-base-union.json >> @@ -1,4 +1,4 @@ >> -# FIXME: the error message needs help: we require the base to be a struct >> +# we require the base to be a struct >> { 'enum': 'TestEnum', >> 'data': [ 'value1', 'value2' ] } >> { 'type': 'TestTypeA', > > This looks unrelated. Does it belong to PATCH 25?
Uggh - more evidence of botched hunk motion across rebase. > > [...] > > Regardless, > Reviewed-by: Markus Armbruster <[email protected]> End result is the same, so unless I need to rebase on top of all the other patches going in right now, I won't bother to respin. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
