Merge remote-tracking branch 'qmp/for-anthony' into staging

[qemu.git] / compatfd.h

diff --git a/compatfd.h b/compatfd.h
index e7db2a1093f7ea2ef90be3640eb12074177687b7..fc3791520f3209a074d1f0b8b210940692bb836d 100644 (file)
--- a/compatfd.h
+++ b/compatfd.h
@@ -16,17 +16,28 @@
 
 #include <signal.h>
 
-#if defined(__linux__) && !defined(SYS_signalfd)
-struct signalfd_siginfo {
-    uint32_t ssi_signo;
-    uint8_t pad[124];
+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) */
 };
-#else
-#include <linux/signalfd.h>
-#endif
 
 int qemu_signalfd(const sigset_t *mask);
 
-int qemu_eventfd(int *fds);
-
 #endif