ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux-user: Fix definition of target_sigevent for 32-bit guests 

The sigevent structure includes a union with some fields which
are pointers. For the QEMU target_sigevent structure we must
represent these as abi_ulongs, not host function pointers.

This error was causing the compiler to believe it should 8-align
the _sigev_un union on a 64-bit host, which meant that the
code in target_to_host_sigevent() was looking at the wrong
offset to find the _tid field, and timer_create() would
spuriously fail with EINVAL.

This fixes the final loose end noted in LP:1042388.

While we're editing the structure, switch the 'int32_t' fields
to 'abi_int'; this will only matter for guests with non-standard
integer alignment like m68k.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
This commit is contained in:
Peter Maydell 2016-09-02 18:40:01 +01:00 committed by Riku Voipio
parent 52956a9b46
commit 17351c3f11
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
linux-user/syscall_defs.h
View File

@ -2658,15 +2658,19 @@ typedef int32_t target_timer_t;
struct target_sigevent {
target_sigval_t sigev_value;
int32_t sigev_signo;
int32_t sigev_notify;
abi_int sigev_signo;
abi_int sigev_notify;
union {
int32_t _pad[TARGET_SIGEV_PAD_SIZE];
int32_t _tid;
abi_int _pad[TARGET_SIGEV_PAD_SIZE];
abi_int _tid;
/* The kernel (and thus QEMU) never looks at these;
* they're only used as part of the ABI between a
* userspace program and libc.
*/
struct {
void (*_function)(sigval_t);
void *_attribute;
abi_ulong _function;
abi_ulong _attribute;
} _sigev_thread;
} _sigev_un;
};