From: Warner Losh <imp@bsdimp.com>
To: qemu-devel@nongnu.org
Cc: Kyle Evans <kevans@freebsd.org>,
richard.henderson@linaro.org, f4bug@amsat.org,
Warner Losh <imp@bsdimp.com>
Subject: [PATCH 13/14] bsd-user: Rename sigqueue to qemu_sigqueue
Date: Wed, 22 Sep 2021 00:14:37 -0600 [thread overview]
Message-ID: <20210922061438.27645-14-imp@bsdimp.com> (raw)
In-Reply-To: <20210922061438.27645-1-imp@bsdimp.com>
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
next prev parent reply other threads:[~2021-09-22 6:19 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-22 6:14 [PATCH 00/14] bsd-user: misc cleanup for aarch64 import Warner Losh
2021-09-22 6:14 ` [PATCH 01/14] bsd-user/target_os-user.h: Remove support for FreeBSD older than 12.0 Warner Losh
2021-09-22 6:14 ` [PATCH 02/14] bsd-user/strace.list: Remove support for FreeBSD versions " Warner Losh
2021-09-23 17:57 ` Richard Henderson
2021-09-22 6:14 ` [PATCH 03/14] bsd-user: TARGET_RESET define is unused, remove it Warner Losh
2021-09-23 17:57 ` Richard Henderson
2021-09-25 10:30 ` Philippe Mathieu-Daudé
2021-09-22 6:14 ` [PATCH 04/14] bsd-user: export get_errno and is_error from syscall.c Warner Losh
2021-09-23 17:58 ` Richard Henderson
2021-09-25 10:33 ` Philippe Mathieu-Daudé
2021-09-26 17:14 ` Warner Losh
2021-09-22 6:14 ` [PATCH 05/14] bsd-user/errno_defs.h: Add internal error numbers Warner Losh
2021-09-23 17:59 ` Richard Henderson
2021-09-22 6:14 ` [PATCH 06/14] bsd-user: move TARGET_MC_GET_CLEAR_RET to target_os_signal.h Warner Losh
2021-09-23 18:00 ` Richard Henderson
2021-09-25 10:35 ` Philippe Mathieu-Daudé
2021-09-26 17:16 ` Warner Losh
2021-09-22 6:14 ` [PATCH 07/14] bsd-user/target_os_elf.h: Remove fallback ELF_HWCAP and reorder Warner Losh
2021-09-23 18:01 ` Richard Henderson
2021-09-25 10:36 ` Philippe Mathieu-Daudé
2021-09-22 6:14 ` [PATCH 08/14] bsd-user/target_os_elf: If ELF_HWCAP2 is defined, publish it Warner Losh
2021-09-23 18:01 ` Richard Henderson
2021-09-25 10:37 ` Philippe Mathieu-Daudé
2021-09-22 6:14 ` [PATCH 09/14] bsd-user: Remove used from TaskState Warner Losh
2021-09-23 18:02 ` Richard Henderson
2021-09-25 10:38 ` Philippe Mathieu-Daudé
2021-09-22 6:14 ` [PATCH 10/14] bsd-user: Add stop_all_tasks Warner Losh
2021-09-23 18:04 ` Richard Henderson
2021-09-22 6:14 ` [PATCH 11/14] bsd-user/sysarch: Move to using do_freebsd_arch_sysarch interface Warner Losh
2021-09-23 18:07 ` Richard Henderson
2021-09-24 15:25 ` Warner Losh
2021-09-22 6:14 ` [PATCH 12/14] bsd-user/sysarch: Provide a per-arch framework for sysarch syscall Warner Losh
2021-09-23 18:08 ` Richard Henderson
2021-09-25 10:46 ` Philippe Mathieu-Daudé
2021-09-26 17:21 ` Warner Losh
2021-09-22 6:14 ` Warner Losh [this message]
2021-09-23 18:09 ` [PATCH 13/14] bsd-user: Rename sigqueue to qemu_sigqueue Richard Henderson
2021-09-25 10:46 ` Philippe Mathieu-Daudé
2021-09-22 6:14 ` [PATCH 14/14] bsd-user/signal: Create a dummy signal queueing function Warner Losh
2021-09-23 18:13 ` Richard Henderson
2021-09-24 20:11 ` Warner Losh
2021-09-24 20:30 ` Kyle Evans
2021-09-24 23:51 ` Richard Henderson
2021-09-26 18:14 ` Warner Losh
2021-09-26 18:34 ` Philippe Mathieu-Daudé
2021-09-26 19:00 ` Warner Losh
2021-09-26 19:13 ` Philippe Mathieu-Daudé
2021-09-25 10:50 ` Philippe Mathieu-Daudé
2021-09-25 14:53 ` Warner Losh
2021-09-26 3:06 ` Warner Losh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210922061438.27645-14-imp@bsdimp.com \
--to=imp@bsdimp.com \
--cc=f4bug@amsat.org \
--cc=kevans@freebsd.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).