From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36713) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UvGUF-0001Kd-Qp for qemu-devel@nongnu.org; Fri, 05 Jul 2013 20:36:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UvGUC-0002rl-JW for qemu-devel@nongnu.org; Fri, 05 Jul 2013 20:36:27 -0400 Received: from cantor2.suse.de ([195.135.220.15]:42311 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UvGUC-0002qv-Cd for qemu-devel@nongnu.org; Fri, 05 Jul 2013 20:36:24 -0400 From: Alexander Graf Date: Sat, 6 Jul 2013 02:36:14 +0200 Message-Id: <1373070978-11966-6-git-send-email-agraf@suse.de> In-Reply-To: <1373070978-11966-1-git-send-email-agraf@suse.de> References: <1373070978-11966-1-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH 5/9] linux-user: Fix epoll on ARM hosts List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Riku Voipio The epoll emulation uses data structures without packing them, so the compiler might choose to add padding inside. This patch makes the most offending one (target_epoll_event) a packed structure to make sure we don't pad it by accident. ARM would pad it, so declare the padding mandatory for ARM targets. This fixes i386-on-ARM epoll emulation for me. Signed-off-by: Alexander Graf --- linux-user/syscall_defs.h | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index 8b06a19..fbc3cac 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -2434,8 +2434,11 @@ typedef union target_epoll_data { struct target_epoll_event { uint32_t events; +#ifdef TARGET_ARM + uint32_t __pad; +#endif target_epoll_data_t data; -}; +} QEMU_PACKED; #endif struct target_rlimit64 { uint64_t rlim_cur; -- 1.6.0.2