Thanks, applied.
On Fri, Dec 28, 2012 at 6:38 AM, Brad Smith <b...@comstyle.com> wrote:
> Disable the semaphores fallback code for OpenBSD as modern OpenBSD
> releases now have sem_timedwait().
>
> Signed-off-by: Brad Smith <b...@comstyle.com>
>
> diff --git a/include/qemu/thread-posix.h b/include/qemu/thread-posix.h
> index 380bae2..0f30dcc 100644
> --- a/include/qemu/thread-posix.h
> +++ b/include/qemu/thread-posix.h
> @@ -12,7 +12,7 @@ struct QemuCond {
> };
>
> struct QemuSemaphore {
> -#if defined(__OpenBSD__) || defined(__APPLE__) || defined(__NetBSD__)
> +#if defined(__APPLE__) || defined(__NetBSD__)
> pthread_mutex_t lock;
> pthread_cond_t cond;
> int count;
> diff --git a/qemu-thread-posix.c b/qemu-thread-posix.c
> index 7be292e..6374df3 100644
> --- a/qemu-thread-posix.c
> +++ b/qemu-thread-posix.c
> @@ -122,7 +122,7 @@ void qemu_sem_init(QemuSemaphore *sem, int init)
> {
> int rc;
>
> -#if defined(__OpenBSD__) || defined(__APPLE__) || defined(__NetBSD__)
> +#if defined(__APPLE__) || defined(__NetBSD__)
> rc = pthread_mutex_init(&sem->lock, NULL);
> if (rc != 0) {
> error_exit(rc, __func__);
> @@ -147,7 +147,7 @@ void qemu_sem_destroy(QemuSemaphore *sem)
> {
> int rc;
>
> -#if defined(__OpenBSD__) || defined(__APPLE__) || defined(__NetBSD__)
> +#if defined(__APPLE__) || defined(__NetBSD__)
> rc = pthread_cond_destroy(&sem->cond);
> if (rc < 0) {
> error_exit(rc, __func__);
> @@ -168,7 +168,7 @@ void qemu_sem_post(QemuSemaphore *sem)
> {
> int rc;
>
> -#if defined(__OpenBSD__) || defined(__APPLE__) || defined(__NetBSD__)
> +#if defined(__APPLE__) || defined(__NetBSD__)
> pthread_mutex_lock(&sem->lock);
> if (sem->count == INT_MAX) {
> rc = EINVAL;
> @@ -206,7 +206,7 @@ int qemu_sem_timedwait(QemuSemaphore *sem, int ms)
> int rc;
> struct timespec ts;
>
> -#if defined(__OpenBSD__) || defined(__APPLE__) || defined(__NetBSD__)
> +#if defined(__APPLE__) || defined(__NetBSD__)
> compute_abs_deadline(&ts, ms);
> pthread_mutex_lock(&sem->lock);
> --sem->count;
> @@ -248,7 +248,7 @@ int qemu_sem_timedwait(QemuSemaphore *sem, int ms)
>
> void qemu_sem_wait(QemuSemaphore *sem)
> {
> -#if defined(__OpenBSD__) || defined(__APPLE__) || defined(__NetBSD__)
> +#if defined(__APPLE__) || defined(__NetBSD__)
> pthread_mutex_lock(&sem->lock);
> --sem->count;
> while (sem->count < 0) {
>
> --
> This message has been scanned for viruses and
> dangerous content by MailScanner, and is
> believed to be clean.
>
>
