[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 13/14] bsd-user: Rename sigqueue to qemu_sigqueue
From: |
Warner Losh |
Subject: |
[PATCH 13/14] bsd-user: Rename sigqueue to qemu_sigqueue |
Date: |
Wed, 22 Sep 2021 00:14:37 -0600 |
To avoid a name clash with FreeBSD's sigqueue data structure in
signalvar.h, rename sigqueue to qemu_sigqueue. This sturcture
is currently defined, but unused.
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/qemu.h | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
index 3dde381d5d..5a2fd87e44 100644
--- a/bsd-user/qemu.h
+++ b/bsd-user/qemu.h
@@ -73,15 +73,15 @@ struct image_info {
#define MAX_SIGQUEUE_SIZE 1024
-struct sigqueue {
- struct sigqueue *next;
+struct qemu_sigqueue {
+ struct qemu_sigqueue *next;
+ target_siginfo_t info;
};
struct emulated_sigtable {
int pending; /* true if signal is pending */
- struct sigqueue *first;
- /* in order to always have memory for the first signal, we put it here */
- struct sigqueue info;
+ struct qemu_sigqueue *first;
+ struct qemu_sigqueue info; /* Put first signal info here */
};
/*
@@ -95,8 +95,8 @@ typedef struct TaskState {
struct image_info *info;
struct emulated_sigtable sigtab[TARGET_NSIG];
- struct sigqueue sigqueue_table[MAX_SIGQUEUE_SIZE]; /* siginfo queue */
- struct sigqueue *first_free; /* first free siginfo queue entry */
+ struct qemu_sigqueue sigqueue_table[MAX_SIGQUEUE_SIZE]; /* siginfo queue */
+ struct qemu_sigqueue *first_free; /* first free siginfo queue entry */
int signal_pending; /* non zero if a signal may be pending */
uint8_t stack[];
--
2.32.0
- Re: [PATCH 05/14] bsd-user/errno_defs.h: Add internal error numbers, (continued)
- [PATCH 07/14] bsd-user/target_os_elf.h: Remove fallback ELF_HWCAP and reorder, Warner Losh, 2021/09/22
- [PATCH 04/14] bsd-user: export get_errno and is_error from syscall.c, Warner Losh, 2021/09/22
- [PATCH 09/14] bsd-user: Remove used from TaskState, Warner Losh, 2021/09/22
- [PATCH 13/14] bsd-user: Rename sigqueue to qemu_sigqueue,
Warner Losh <=
- [PATCH 10/14] bsd-user: Add stop_all_tasks, Warner Losh, 2021/09/22
- [PATCH 11/14] bsd-user/sysarch: Move to using do_freebsd_arch_sysarch interface, Warner Losh, 2021/09/22
- [PATCH 12/14] bsd-user/sysarch: Provide a per-arch framework for sysarch syscall, Warner Losh, 2021/09/22