From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:35393)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <riku.voipio@linaro.org>) id 1bU99G-0007yJ-O9
	for qemu-devel@nongnu.org; Mon, 01 Aug 2016 05:04:35 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <riku.voipio@linaro.org>) id 1bU99B-0000GX-Hx
	for qemu-devel@nongnu.org; Mon, 01 Aug 2016 05:04:33 -0400
Received: from jessie.kos.to ([212.47.231.226]:41082 helo=pilvi.kos.to)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <riku.voipio@linaro.org>) id 1bU99B-0000Fi-Be
	for qemu-devel@nongnu.org; Mon, 01 Aug 2016 05:04:29 -0400
Date: Mon, 1 Aug 2016 12:04:20 +0300
From: Riku Voipio <riku.voipio@iki.fi>
Message-ID: <20160801090420.GA31008@beaming.home>
References: <1469707079-9049-1-git-send-email-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1469707079-9049-1-git-send-email-peter.maydell@linaro.org>
Subject: Re: [Qemu-devel] [PATCH] linux-user: Use correct alignment for long
 long on i386 guests
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: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-devel@nongnu.org, Icenowy Zheng <icenowy@aosc.xyz>, laurent@vivier.eu

On Thu, Jul 28, 2016 at 12:57:59PM +0100, Peter Maydell wrote:
> For i386, the ABI specifies that 'long long' (8 byte values)
> need only be 4 aligned, but we were requiring them to be
> 8-aligned. This meant we were laying out the target_epoll_event
> structure wrongly. Add a suitable ifdef to abitypes.h to
> specify the i386-specific alignment requirement.

Thanks, applied all your patches upto this patch to:

https://git.linaro.org/people/riku.voipio/qemu.git/shortlog/refs/heads/for-next

I take none of the patches are important enough to warrant including
in 2.7?

> Reported-by: Icenowy Zheng <icenowy@aosc.xyz>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  include/exec/user/abitypes.h | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/include/exec/user/abitypes.h b/include/exec/user/abitypes.h
> index a09d6c6..ba18860 100644
> --- a/include/exec/user/abitypes.h
> +++ b/include/exec/user/abitypes.h
> @@ -15,6 +15,10 @@
>  #define ABI_LLONG_ALIGNMENT 2
>  #endif
>  
> +#if defined(TARGET_I386) && !defined(TARGET_X86_64)
> +#define ABI_LLONG_ALIGNMENT 4
> +#endif
> +
>  #ifndef ABI_SHORT_ALIGNMENT
>  #define ABI_SHORT_ALIGNMENT 2
>  #endif
> -- 
> 1.9.1
>