On Mon, Feb 5, 2018 at 7:13 PM, Markus Armbruster <arm...@redhat.com> wrote: > Marc-André Lureau <marcandre.lur...@gmail.com> writes: > >> Hi >> >> On Thu, Jan 11, 2018 at 10:32 PM, Marc-André Lureau >> <marcandre.lur...@redhat.com> wrote: >>> Add a pragma that allows to tag the following expressions in the >>> schema with a unit name. By default, an expression has no unit name. >>> >>> See the docs/devel/qapi-code-gen.txt for more details. >>> >> >> I inadvertently merged the following patch "qapi: add a -u/--unit >> option to specify which unit to visit" with this one. >> >> Fixed in the github branch: https://github.com/elmarco/qemu/commits/qapi-if > > Looks like it's still messed up: the patch there adds the pragma to > docs/devel/qapi-code-gen.txt, the test cases, but no code. Make check > fails. The code appears to be in the next patch. Please advise. >
More rebase mistakes.. fixed in github. How do you want to proceed? The -u/-i options from this series seems unnecessary one we have the "modularize generated qapi code" you proposed. But -i/-u can easily be removed too later on, depending on what goes first. If you can take the first patches of the series, and tell me based on what I should rebase or what to expect, I can keep working on it. In the meantime, I am a bit stuck. -- Marc-André Lureau