diff options
| author |   Richard W.M. Jones <rjones@redhat.com> | 2012-07-05 14:28:03 +0100 |
|---|---|---|
| committer |   Doug Goldstein <cardoe@cardoe.com> | 2012-10-20 11:13:40 -0500 |
| commit | ecb204a3cdadf78ea645173d20abdc55b92b721b (patch) | |
| tree | 49741a1b9cb0a75a733cf00b981e962cd4f28bf8 | |
| parent | qemu-kvm: Fix default machine options (diff) | |
| download | qemu-kvm-ecb204a3cdadf78ea645173d20abdc55b92b721b.tar.gz qemu-kvm-ecb204a3cdadf78ea645173d20abdc55b92b721b.tar.bz2 qemu-kvm-ecb204a3cdadf78ea645173d20abdc55b92b721b.zip | |
Replace 'struct siginfo' with 'siginfo_t'.
glibc 2.16 will remove the undocumented definition of 'struct siginfo'
from <bits/siginfo.h>.
This change is already present in glibc 2.15.90, so qemu compilation
of certain targets (eg. cris-user) breaks.
This struct was always typedef'd to be the same as 'siginfo_t' which
is what POSIX documents, so use that instead.
Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
| -rw-r--r-- | linux-user/signal.c | 8 | ||||
| -rw-r--r-- | user-exec.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/linux-user/signal.c b/linux-user/signal.c index b1e139d6f..8420b4119 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -2849,7 +2849,7 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, * Arguments to signal handler: * * a0 = signal number - * a1 = pointer to struct siginfo + * a1 = pointer to siginfo_t * a2 = pointer to struct ucontext * * $25 and PC point to the signal handler, $29 points to the @@ -3255,7 +3255,7 @@ struct target_signal_frame { }; struct rt_signal_frame { - struct siginfo info; + siginfo_t info; struct ucontext uc; uint32_t tramp[2]; }; @@ -3474,9 +3474,9 @@ struct target_signal_frame { }; struct rt_signal_frame { - struct siginfo *pinfo; + siginfo_t *pinfo; void *puc; - struct siginfo info; + siginfo_t info; struct ucontext uc; uint8_t retcode[8]; /* Trampoline code. */ }; diff --git a/user-exec.c b/user-exec.c index d8c2ad9f2..970810376 100644 --- a/user-exec.c +++ b/user-exec.c @@ -588,7 +588,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, int cpu_signal_handler(int host_signum, void *pinfo, void *puc) { - struct siginfo *info = pinfo; + siginfo_t *info = pinfo; struct ucontext *uc = puc; unsigned long pc = uc->uc_mcontext.sc_iaoq[0]; uint32_t insn = *(uint32_t *)pc; |