From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:42593)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <flukshun@gmail.com>) id 1VcI70-0005Km-Pd
	for qemu-devel@nongnu.org; Fri, 01 Nov 2013 13:02:24 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <flukshun@gmail.com>) id 1VcI6v-0004nN-HP
	for qemu-devel@nongnu.org; Fri, 01 Nov 2013 13:02:18 -0400
Received: from mail-ob0-x22a.google.com ([2607:f8b0:4003:c01::22a]:43018)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <flukshun@gmail.com>) id 1VcI6v-0004nI-Br
	for qemu-devel@nongnu.org; Fri, 01 Nov 2013 13:02:13 -0400
Received: by mail-ob0-f170.google.com with SMTP id wp18so4850041obc.29
	for <qemu-devel@nongnu.org>; Fri, 01 Nov 2013 10:02:12 -0700 (PDT)
Sender: fluxion <flukshun@gmail.com>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
From: Michael Roth <mdroth@linux.vnet.ibm.com>
In-Reply-To: <1383251161-10441-1-git-send-email-rth@twiddle.net>
References: <1383251161-10441-1-git-send-email-rth@twiddle.net>
Message-ID: <20131101170208.22021.84796@loki>
Date: Fri, 01 Nov 2013 12:02:08 -0500
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>, qemu-devel@nongnu.org
Cc: lcapitulino@redhat.com

Quoting Richard Henderson (2013-10-31 15:26:01)
> 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>

Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com>

> ---
>  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 =3D None):
>      substructs =3D []
>      ret =3D ''
> -    full_name =3D name if not fn_prefix else "%s_%s" % (name, fn_prefix)
> +    if not fn_prefix:
> +        full_name =3D name
> +    else:
> +        full_name =3D "%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 =3D name if not field_prefix else "%s_%s" % (field_prefix,=
 name)
> +    if not field_prefix:
> +        full_name =3D name
> +    else:
> +        full_name =3D "%s_%s" % (field_prefix, name)
> =

>      if len(field_prefix):
>          ret +=3D mcgen('''
> @@ -283,12 +289,17 @@ void visit_type_%(name)s(Visitor *m, %(name)s ** ob=
j, const char *name, Error **
>              name=3Dname)
> =

>      pop_indent()
> +
> +    if not discriminator:
> +        desc_type =3D "type"
> +    else:
> +        desc_type =3D discriminator
>      ret +=3D mcgen('''
>          visit_type_%(name)sKind(m, &(*obj)->kind, "%(type)s", &err);
>          if (!err) {
>              switch ((*obj)->kind) {
>  ''',
> -                 name=3Dname, type=3D"type" if not discriminator else di=
scriminator)
> +                 name=3Dname, type=3Ddesc_type)
> =

>      for key in members:
>          if not discriminator:
> -- =

> 1.8.3.1