Received: from eggs.gnu.org ([2001:4830:134:3::10]:52678) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YK1bz-0006a2-Ol for qemu-devel@nongnu.org; Sat, 07 Feb 2015 04:23:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YK1bw-0002wk-I1 for qemu-devel@nongnu.org; Sat, 07 Feb 2015 04:23:35 -0500 Message-ID: <54D5D991.2010605@msgid.tls.msk.ru> Date: Sat, 07 Feb 2015 12:23:29 +0300 From: Michael Tokarev MIME-Version: 1.0 References: <54CF8735.3080806@partner.samsung.com> In-Reply-To: <54CF8735.3080806@partner.samsung.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2] Fix ABI incompatibility between Qemu-aarch64 and Linux Kernel in signal handling. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Maxim Ostapenko , Peter Maydell Cc: QEMU Trivial , Slava Garbuzov , Riku Voipio , QEMU Developers , Yury Gribov 02.02.2015 17:18, Maxim Ostapenko wrote: > From 5b035df58f9f17e64b35311b6b5f55097c7f8ce1 Mon Sep 17 00:00:00 2001 > From: Max Ostapenko > Date: Mon, 2 Feb 2015 12:03:20 +0400 > Subject: [PATCH] linux-user: wrong TARGET_SI_PAD_SIZE value for some targets. > > Fix TARGET_SI_PAD_SIZE calculation to match the way the kernel does it. > Use different TARGET_SI_PREAMBLE_SIZE for 32-bit and 64-bit targets. I've applied your patch to -trivial. However, the patch has been whitespace- damaged so I had to apply it manually - your mailer added several leading spaces, changed tabs into spaces, and word-wrapped several lines. Please, for the next time, send a patch over email to youself and verify if it still applies to a clean branch -- before sending it to the list. Note also that I used the original subject line of your patch, not the subject line of this emai. Again, please ensure there's just one message with one subject and date, not two ;) Thanks, /mjt > Signed-off-by: Maxim Ostapenko > --- > linux-user/syscall_defs.h | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h > index ebb3be1..9ed6de8 100644 > --- a/linux-user/syscall_defs.h > +++ b/linux-user/syscall_defs.h > @@ -655,7 +655,14 @@ typedef struct { > #endif > > #define TARGET_SI_MAX_SIZE 128 > -#define TARGET_SI_PAD_SIZE ((TARGET_SI_MAX_SIZE/sizeof(int)) - 3) > + > +#if TARGET_ABI_BITS == 32 > +#define TARGET_SI_PREAMBLE_SIZE (3 * sizeof(int)) > +#else > +#define TARGET_SI_PREAMBLE_SIZE (4 * sizeof(int)) > +#endif > + > +#define TARGET_SI_PAD_SIZE ((TARGET_SI_MAX_SIZE - TARGET_SI_PREAMBLE_SIZE) / sizeof(int)) > > typedef struct target_siginfo { > #ifdef TARGET_MIPS