Skip to content

Commit

Permalink
bsd-user: Remove vestiges of signal queueing code
Browse files Browse the repository at this point in the history
bsd-user was copied from linux-user at a time when it queued
signals. Remove those vestiges of thse code. Retain the init function,
even though it's now empty since other stuff will likely be added
there. Make it static since it's not called from outside of main.c

Signed-off-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
  • Loading branch information
bsdimp committed Jan 28, 2022
1 parent 7f96d0a commit b46d4ad
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 20 deletions.
9 changes: 1 addition & 8 deletions bsd-user/main.c
Expand Up @@ -215,15 +215,8 @@ void qemu_cpu_kick(CPUState *cpu)
}

/* Assumes contents are already zeroed. */
void init_task_state(TaskState *ts)
static void init_task_state(TaskState *ts)
{
int i;

ts->first_free = ts->sigqueue_table;
for (i = 0; i < MAX_SIGQUEUE_SIZE - 1; i++) {
ts->sigqueue_table[i].next = &ts->sigqueue_table[i + 1];
}
ts->sigqueue_table[i].next = NULL;
}

void gemu_log(const char *fmt, ...)
Expand Down
13 changes: 1 addition & 12 deletions bsd-user/qemu.h
Expand Up @@ -70,17 +70,9 @@ struct image_info {
uint32_t elf_flags;
};

#define MAX_SIGQUEUE_SIZE 1024

struct qemu_sigqueue {
struct qemu_sigqueue *next;
target_siginfo_t info;
};

struct emulated_sigtable {
int pending; /* true if signal is pending */
struct qemu_sigqueue *first;
struct qemu_sigqueue info; /* Put first signal info here */
target_siginfo_t info;
};

/*
Expand All @@ -94,14 +86,11 @@ typedef struct TaskState {
struct image_info *info;

struct emulated_sigtable sigtab[TARGET_NSIG];
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[];
} __attribute__((aligned(16))) TaskState;

void init_task_state(TaskState *ts);
void stop_all_tasks(void);
extern const char *qemu_uname_release;

Expand Down

0 comments on commit b46d4ad

Please sign in to comment.