From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:51878)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1VcJ1I-000850-4h
	for qemu-devel@nongnu.org; Fri, 01 Nov 2013 14:00:33 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1VcJ1C-0004Hb-Js
	for qemu-devel@nongnu.org; Fri, 01 Nov 2013 14:00:28 -0400
Date: Fri, 1 Nov 2013 10:42:05 -0400
From: Luiz Capitulino <lcapitulino@redhat.com>
Message-ID: <20131101104205.75a4208b@redhat.com>
In-Reply-To: <1383251161-10441-1-git-send-email-rth@twiddle.net>
References: <1383251161-10441-1-git-send-email-rth@twiddle.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] Adjust qapi-visit for python-2.4.3
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Richard Henderson <rth@twiddle.net>
Cc: qemu-stable@nongnu.org, qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com

On Thu, 31 Oct 2013 13:26:01 -0700
Richard Henderson <rth@twiddle.net> wrote:

> We say we support python 2.4, but python 2.4.3 does not
> support the "expr if test else expr" syntax used here.
> 
> This allows QEMU to compile on RHEL 5.3, the last release for ia64.
> 
> Signed-off-by: Richard Henderson <rth@twiddle.net>

Applied to the qmp branch, thanks.

> ---
>  scripts/qapi-visit.py | 17 ++++++++++++++---
>  1 file changed, 14 insertions(+), 3 deletions(-)
> 
> diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
> index c39e628..65f1a54 100644
> --- a/scripts/qapi-visit.py
> +++ b/scripts/qapi-visit.py
> @@ -20,7 +20,10 @@ import errno
>  def generate_visit_struct_fields(name, field_prefix, fn_prefix, members, base = None):
>      substructs = []
>      ret = ''
> -    full_name = name if not fn_prefix else "%s_%s" % (name, fn_prefix)
> +    if not fn_prefix:
> +        full_name = name
> +    else:
> +        full_name = "%s_%s" % (name, fn_prefix)
>  
>      for argname, argentry, optional, structured in parse_args(members):
>          if structured:
> @@ -97,7 +100,10 @@ if (!error_is_set(errp)) {
>  ''')
>      push_indent()
>  
> -    full_name = name if not field_prefix else "%s_%s" % (field_prefix, name)
> +    if not field_prefix:
> +        full_name = name
> +    else:
> +        full_name = "%s_%s" % (field_prefix, name)
>  
>      if len(field_prefix):
>          ret += mcgen('''
> @@ -283,12 +289,17 @@ void visit_type_%(name)s(Visitor *m, %(name)s ** obj, const char *name, Error **
>              name=name)
>  
>      pop_indent()
> +
> +    if not discriminator:
> +        desc_type = "type"
> +    else:
> +        desc_type = discriminator
>      ret += mcgen('''
>          visit_type_%(name)sKind(m, &(*obj)->kind, "%(type)s", &err);
>          if (!err) {
>              switch ((*obj)->kind) {
>  ''',
> -                 name=name, type="type" if not discriminator else discriminator)
> +                 name=name, type=desc_type)
>  
>      for key in members:
>          if not discriminator: