[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH for-2.9 31/47] qapi: Fix detection of doc / expr
From: |
Eric Blake |
Subject: |
Re: [Qemu-devel] [PATCH for-2.9 31/47] qapi: Fix detection of doc / expression mismatch |
Date: |
Wed, 15 Mar 2017 07:14:53 -0500 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 |
On 03/15/2017 02:39 AM, Markus Armbruster wrote:
> Eric Blake <address@hidden> writes:
>
>> On 03/13/2017 01:18 AM, Markus Armbruster wrote:
>>> This fixes the errors uncovered by the previous commit.
>>>
>>> Signed-off-by: Markus Armbruster <address@hidden>
>>> ---
>>
>>>
>>> expr = self.get_expr(False)
>>> if 'include' in expr:
>>> + self.reject_expr_doc()
>>> if len(expr) != 1:
>>
>> Do you also need to handle 'pragma' expressions added earlier in the series?
>
> Yes.
>
>
> Need to squash in
>
> diff --git a/scripts/qapi.py b/scripts/qapi.py
> index 1dc33c9..8d55ff4 100644
> --- a/scripts/qapi.py
> +++ b/scripts/qapi.py
> @@ -301,6 +301,7 @@ class QAPISchemaParser(object):
> self._include(include, info, os.path.dirname(abs_fname),
> previously_included)
> elif "pragma" in expr:
> + self.reject_expr_doc()
> if len(expr) != 1:
> raise QAPISemError(info, "Invalid 'pragma' directive")
> for name, value in expr['pragma'].iteritems():
>
Yep, that looks like it. So with the test updated in 30/47, and this
squashed into 31/47, you can add:
Reviewed-by: Eric Blake <address@hidden>
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
[Qemu-devel] [PATCH for-2.9 41/47] qapi: Factor add_name() calls out of the meta conditional, Markus Armbruster, 2017/03/13
[Qemu-devel] [PATCH for-2.9 19/47] qapi: Prefer single-quoted strings more consistently, Markus Armbruster, 2017/03/13
[Qemu-devel] [PATCH for-2.9 14/47] qapi: Prepare for requiring more complete documentation, Markus Armbruster, 2017/03/13
[Qemu-devel] [PATCH for-2.9 26/47] qapi2texi: Generate reference to base type members, Markus Armbruster, 2017/03/13