Remove thread_create and use qemu_thread_create instead. Signed-off-by: Arun R Bharadwaj <a...@linux.vnet.ibm.com> Reviewed-by: Stefan Hajnoczi <stefa...@linux.vnet.ibm.com> --- posix-aio-compat.c | 29 ++--------------------------- 1 files changed, 2 insertions(+), 27 deletions(-)
diff --git a/posix-aio-compat.c b/posix-aio-compat.c index 95ba805..a7625d8 100644 --- a/posix-aio-compat.c +++ b/posix-aio-compat.c @@ -13,7 +13,6 @@ #include <sys/ioctl.h> #include <sys/types.h> -#include <pthread.h> #include <unistd.h> #include <errno.h> #include <time.h> @@ -83,7 +82,6 @@ typedef struct PosixAioState { /* Default ThreadletQueue */ static ThreadletQueue globalqueue; static int globalqueue_init; -static pthread_attr_t attr; #ifdef CONFIG_PREADV static int preadv_present = 1; @@ -102,13 +100,6 @@ static void die(const char *what) die2(errno, what); } -static void thread_create(pthread_t *thread, pthread_attr_t *attr, - void *(*start_routine)(void*), void *arg) -{ - int ret = pthread_create(thread, attr, start_routine, arg); - if (ret) die2(ret, "pthread_create"); -} - static ssize_t handle_aiocb_ioctl(struct qemu_paiocb *aiocb) { int ret; @@ -374,19 +365,12 @@ static void handle_work(ThreadletWork *work) static void spawn_threadlet(ThreadletQueue *queue) { - pthread_t thread_id; - sigset_t set, oldset; + QemuThread thread; queue->cur_threads++; queue->idle_threads++; - /* block all signals */ - if (sigfillset(&set)) die("sigfillset"); - if (sigprocmask(SIG_SETMASK, &set, &oldset)) die("sigprocmask"); - - thread_create(&thread_id, &attr, threadlet_worker, queue); - - if (sigprocmask(SIG_SETMASK, &oldset, NULL)) die("sigprocmask restore"); + qemu_thread_create(&thread, threadlet_worker, queue); } /** @@ -671,7 +655,6 @@ int paio_init(void) struct sigaction act; PosixAioState *s; int fds[2]; - int ret; if (posix_aio_state) return 0; @@ -701,14 +684,6 @@ int paio_init(void) qemu_aio_set_fd_handler(s->rfd, posix_aio_read, NULL, posix_aio_flush, posix_aio_process_queue, s); - ret = pthread_attr_init(&attr); - if (ret) - die2(ret, "pthread_attr_init"); - - ret = pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); - if (ret) - die2(ret, "pthread_attr_setdetachstate"); - posix_aio_state = s; return 0; }