Commit d98d4072 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

cpus: remove ugly cast on sigbus_handler 



The cast is there because sigbus_handler is invoked via sigfd_handler.
But it feels just wrong to use struct qemu_signalfd_siginfo in the
prototype of a function that is passed to sigaction.

Instead, do a simple-minded conversion of qemu_signalfd_siginfo to
siginfo_t.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 30f3dda2

cpus.c

+3 −9
Original line number Diff line number Diff line
@@ -51,10 +51,6 @@ 
#include "hw/nmi.h"

#include "sysemu/replay.h"



#ifndef _WIN32

#include "qemu/compatfd.h"

#endif



#ifdef CONFIG_LINUX



#include <sys/prctl.h>
@@ -924,11 +920,9 @@ static void sigbus_reraise(void) 
    abort();

}



static void sigbus_handler(int n, struct qemu_signalfd_siginfo *siginfo,

                           void *ctx)

static void sigbus_handler(int n, siginfo_t *siginfo, void *ctx)

{

    if (kvm_on_sigbus(siginfo->ssi_code,

                      (void *)(intptr_t)siginfo->ssi_addr)) {

    if (kvm_on_sigbus(siginfo->si_code, siginfo->si_addr)) {

        sigbus_reraise();

    }

}
@@ -939,7 +933,7 @@ static void qemu_init_sigbus(void) 


    memset(&action, 0, sizeof(action));

    action.sa_flags = SA_SIGINFO;

    action.sa_sigaction = (void (*)(int, siginfo_t*, void*))sigbus_handler;

    action.sa_sigaction = sigbus_handler;

    sigaction(SIGBUS, &action, NULL);



    prctl(PR_MCE_KILL, PR_MCE_KILL_SET, PR_MCE_KILL_EARLY, 0, 0);

include/qemu/compatfd.h

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
/*

 * signalfd/eventfd compatibility

 *

 * Copyright IBM, Corp. 2008

 *

 * Authors:

 *  Anthony Liguori   <aliguori@us.ibm.com>

 *

 * This work is licensed under the terms of the GNU GPL, version 2.  See

 * the COPYING file in the top-level directory.

 *

 */



#ifndef QEMU_COMPATFD_H

#define QEMU_COMPATFD_H





struct qemu_signalfd_siginfo {

    uint32_t ssi_signo;   /* Signal number */

    int32_t  ssi_errno;   /* Error number (unused) */

    int32_t  ssi_code;    /* Signal code */

    uint32_t ssi_pid;     /* PID of sender */

    uint32_t ssi_uid;     /* Real UID of sender */

    int32_t  ssi_fd;      /* File descriptor (SIGIO) */

    uint32_t ssi_tid;     /* Kernel timer ID (POSIX timers) */

    uint32_t ssi_band;    /* Band event (SIGIO) */

    uint32_t ssi_overrun; /* POSIX timer overrun count */

    uint32_t ssi_trapno;  /* Trap number that caused signal */

    int32_t  ssi_status;  /* Exit status or signal (SIGCHLD) */

    int32_t  ssi_int;     /* Integer sent by sigqueue(2) */

    uint64_t ssi_ptr;     /* Pointer sent by sigqueue(2) */

    uint64_t ssi_utime;   /* User CPU time consumed (SIGCHLD) */

    uint64_t ssi_stime;   /* System CPU time consumed (SIGCHLD) */

    uint64_t ssi_addr;    /* Address that generated signal

                             (for hardware-generated signals) */

    uint8_t  pad[48];     /* Pad size to 128 bytes (allow for

                             additional fields in the future) */

};



int qemu_signalfd(const sigset_t *mask);



#endif

include/qemu/osdep.h

+28 −0
Original line number Diff line number Diff line
@@ -297,6 +297,34 @@ void qemu_anon_ram_free(void *ptr, size_t size); 
#  define QEMU_VMALLOC_ALIGN getpagesize()

#endif



#ifdef CONFIG_POSIX

struct qemu_signalfd_siginfo {

    uint32_t ssi_signo;   /* Signal number */

    int32_t  ssi_errno;   /* Error number (unused) */

    int32_t  ssi_code;    /* Signal code */

    uint32_t ssi_pid;     /* PID of sender */

    uint32_t ssi_uid;     /* Real UID of sender */

    int32_t  ssi_fd;      /* File descriptor (SIGIO) */

    uint32_t ssi_tid;     /* Kernel timer ID (POSIX timers) */

    uint32_t ssi_band;    /* Band event (SIGIO) */

    uint32_t ssi_overrun; /* POSIX timer overrun count */

    uint32_t ssi_trapno;  /* Trap number that caused signal */

    int32_t  ssi_status;  /* Exit status or signal (SIGCHLD) */

    int32_t  ssi_int;     /* Integer sent by sigqueue(2) */

    uint64_t ssi_ptr;     /* Pointer sent by sigqueue(2) */

    uint64_t ssi_utime;   /* User CPU time consumed (SIGCHLD) */

    uint64_t ssi_stime;   /* System CPU time consumed (SIGCHLD) */

    uint64_t ssi_addr;    /* Address that generated signal

                             (for hardware-generated signals) */

    uint8_t  pad[48];     /* Pad size to 128 bytes (allow for

                             additional fields in the future) */

};



int qemu_signalfd(const sigset_t *mask);

void sigaction_invoke(struct sigaction *action,

                      struct qemu_signalfd_siginfo *info);

#endif



int qemu_madvise(void *addr, size_t len, int advice);



int qemu_open(const char *name, int flags, ...);

util/compatfd.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 


#include "qemu/osdep.h"

#include "qemu-common.h"

#include "qemu/compatfd.h"

#include "qemu/thread.h"



#include <sys/syscall.h>

util/main-loop.c

+1 −4
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ 


#ifndef _WIN32



#include "qemu/compatfd.h"



/* If we have signalfd, we mask out the signals we want to handle and then

 * use signalfd to listen for them.  We rely on whatever the current signal

 * handler is to dispatch the signals when we receive them.
@@ -63,8 +61,7 @@ static void sigfd_handler(void *opaque) 


        sigaction(info.ssi_signo, NULL, &action);

        if ((action.sa_flags & SA_SIGINFO) && action.sa_sigaction) {

            action.sa_sigaction(info.ssi_signo,

                                (siginfo_t *)&info, NULL);

            sigaction_invoke(&action, &info);

        } else if (action.sa_handler) {

            action.sa_handler(info.ssi_signo);

        }