Patchwork : Fix conditional compilation for OpenBSD

login
register
mail settings
Submitter Michael W. Bombardieri
Date March 31, 2013, 12:32 a.m.
Message ID <20130331003229.GA9097@bom.nom.co>
Download mbox | patch
Permalink /patch/232583/
State New
Headers show

Comments

Michael W. Bombardieri - March 31, 2013, 12:32 a.m.
Hi,

This morning I tried building Qemu 1.4.0 on my
Lenovo ThinkPad T61 running OpenBSD/i386 5.1.
The thread code didn't build due to a missing
library function. Looking at the code, #if
statements for NetBSD should also be followed
for OpenBSD. Using the following patch I was
able to build Qemu using clang 3.0 (gcc 4.2.1
ran out of memory). Please consider committing
this patch.

- Michael
Peter Maydell - March 31, 2013, 12:48 a.m.
On 31 March 2013 00:32, Michael W. Bombardieri <mb@ii.net> wrote:
> This morning I tried building Qemu 1.4.0 on my
> Lenovo ThinkPad T61 running OpenBSD/i386 5.1.
> The thread code didn't build due to a missing
> library function. Looking at the code, #if
> statements for NetBSD should also be followed
> for OpenBSD. Using the following patch I was
> able to build Qemu using clang 3.0 (gcc 4.2.1
> ran out of memory). Please consider committing
> this patch.

Hi Michael; thanks for the patch. However I think we should
fix this by having a configure check for sem_timedwait [or
whatever the functions we need are], rather than by piling
up another OS ifdef check.

(If you want to have a go at that it would probably be
useful to read the wiki.qemu.org page on submitting
patches; in particular without a Signed-off-by: line
we can't apply a patch at all.)

-- PMM

Patch

diff --git a/include/qemu/thread-posix.h b/include/qemu/thread-posix.h
index 0f30dcc..772d925 100644
--- a/include/qemu/thread-posix.h
+++ b/include/qemu/thread-posix.h
@@ -12,7 +12,7 @@  struct QemuCond {
 };
 
 struct QemuSemaphore {
-#if defined(__APPLE__) || defined(__NetBSD__)
+#if defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__)
     pthread_mutex_t lock;
     pthread_cond_t cond;
     int count;
diff --git a/util/qemu-thread-posix.c b/util/qemu-thread-posix.c
index 4489abf..fa8a3d8 100644
--- a/util/qemu-thread-posix.c
+++ b/util/qemu-thread-posix.c
@@ -122,7 +122,7 @@  void qemu_sem_init(QemuSemaphore *sem, int init)
 {
     int rc;
 
-#if defined(__APPLE__) || defined(__NetBSD__)
+#if defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__)
     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(__APPLE__) || defined(__NetBSD__)
+#if defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__)
     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(__APPLE__) || defined(__NetBSD__)
+#if defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__)
     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(__APPLE__) || defined(__NetBSD__)
+#if defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__)
     compute_abs_deadline(&ts, ms);
     pthread_mutex_lock(&sem->lock);
     --sem->count;
@@ -249,7 +249,7 @@  int qemu_sem_timedwait(QemuSemaphore *sem, int ms)
 
 void qemu_sem_wait(QemuSemaphore *sem)
 {
-#if defined(__APPLE__) || defined(__NetBSD__)
+#if defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__)
     pthread_mutex_lock(&sem->lock);
     --sem->count;
     while (sem->count < 0) {