From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:44748)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1VJ5ow-0003dq-Aw
	for qemu-devel@nongnu.org; Mon, 09 Sep 2013 14:04:22 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1VJ5os-0002xw-14
	for qemu-devel@nongnu.org; Mon, 09 Sep 2013 14:04:18 -0400
Date: Mon, 9 Sep 2013 14:02:15 -0400
From: Luiz Capitulino <lcapitulino@redhat.com>
Message-ID: <20130909140215.66f541cc@redhat.com>
In-Reply-To: <a9d960fb0b1bc104294ab965116a2d53038b4692.1377988577.git.crobinso@redhat.com>
References: <a9d960fb0b1bc104294ab965116a2d53038b4692.1377988577.git.crobinso@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] qapi-types.py: Fix enum struct sizes on
	i686
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: Cole Robinson <crobinso@redhat.com>
Cc: qemu-stable@nongnu.org, qemu-devel@nongnu.org, Michael Roth <mdroth@linux.vnet.ibm.com>

On Sat, 31 Aug 2013 18:36:17 -0400
Cole Robinson <crobinso@redhat.com> wrote:

> Unlike other list types, enum wasn't adding any padding, which caused
> a mismatch between the generated struct size and GenericList struct
> size. More details in a678e26cbe89f7a27cbce794c2c2784571ee9d21
> 
> This crashed qemu if calling qmp query-tpm-types for example, which
> upsets libvirt capabilities probing. Reproducer on i686:
> 
> (sleep 5; printf '{"execute":"qmp_capabilities"}\n{"execute":"query-tpm-types"}\n') | ./i386-softmmu/qemu-system-i386 -S -nodefaults -nographic -M none -qmp stdio
> 
> https://bugs.launchpad.net/qemu/+bug/1219207
> 
> Cc: qemu-stable@nongnu.org
> Signed-off-by: Cole Robinson <crobinso@redhat.com>

Applied to the qmp branch, thanks.

> ---
>  scripts/qapi-types.py | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py
> index 5ee46ea..5d31b06 100644
> --- a/scripts/qapi-types.py
> +++ b/scripts/qapi-types.py
> @@ -51,7 +51,10 @@ def generate_fwd_enum_struct(name, members):
>      return mcgen('''
>  typedef struct %(name)sList
>  {
> -    %(name)s value;
> +    union {
> +        %(name)s value;
> +        uint64_t padding;
> +    };
>      struct %(name)sList *next;
>  } %(name)sList;
>  ''',