Commit 02d2bd5d authored by Richard W.M. Jones's avatar Richard W.M. Jones Committed by Anthony Liguori
Browse files

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: default avatarRichard W.M. Jones <rjones@redhat.com>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 65dee380

linux-user/signal.c

+4 −4
Original line number Diff line number Diff line
@@ -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. */

};

user-exec.c

+1 −1
Original line number Diff line number Diff line
@@ -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;