[101349] trunk/dports/emulators/qemu

[raimue at macports.org]

Revision: 101349
          https://trac.macports.org/changeset/101349
Author:   raimue at macports.org
Date:     2013-01-09 03:24:37 -0800 (Wed, 09 Jan 2013)
Log Message:
-----------
emulators/qemu:
Fix a bug in the sem_timedwait() replacement used on Mac OS X

Modified Paths:
--------------
    trunk/dports/emulators/qemu/Portfile

Added Paths:
-----------
    trunk/dports/emulators/qemu/files/patch-semaphores-fallback-code.diff

Modified: trunk/dports/emulators/qemu/Portfile
===================================================================
--- trunk/dports/emulators/qemu/Portfile	2013-01-09 11:17:05 UTC (rev 101348)
+++ trunk/dports/emulators/qemu/Portfile	2013-01-09 11:24:37 UTC (rev 101349)
@@ -4,7 +4,7 @@
 
 name                    qemu
 version                 1.3.0
-revision                1
+revision                2
 categories              emulators
 license                 GPL-2+
 platforms               darwin
@@ -24,7 +24,8 @@
                         sha256  878055ec05bc28fecfe2da97eb8bc992e8635575b67cebdfc5ca1ede171140a8
 
 patchfiles              patch-configure.diff \
-                        patch-net-tap-interface.diff
+                        patch-net-tap-interface.diff \
+                        patch-semaphores-fallback-code.diff
 
 depends_build           port:texinfo \
                         port:libtool \

Added: trunk/dports/emulators/qemu/files/patch-semaphores-fallback-code.diff
===================================================================
--- trunk/dports/emulators/qemu/files/patch-semaphores-fallback-code.diff	                        (rev 0)
+++ trunk/dports/emulators/qemu/files/patch-semaphores-fallback-code.diff	2013-01-09 11:24:37 UTC (rev 101349)
@@ -0,0 +1,36 @@
+Upstream-Report: https://bugs.launchpad.net/qemu/+bug/1087114
+
+From a795ef8dcb8cbadffc996c41ff38927a97645234 Mon Sep 17 00:00:00 2001
+From: Brad Smith <brad at comstyle.com>
+Date: Fri, 28 Dec 2012 01:00:26 -0500
+Subject: [PATCH] Fix semaphores fallback code
+
+As reported in bug 1087114 the semaphores fallback code is broken which
+results in QEMU crashing and making QEMU unusable.
+
+This patch is from Paolo.
+
+This needs to be back ported to the 1.3 stable tree as well.
+
+Signed-off-by: Paolo Bonzini <pbonzini at redhat.com>
+Signed-off-by: Brad Smith <brad at comstyle.com>
+Signed-off-by: Blue Swirl <blauwirbel at gmail.com>
+---
+ qemu-thread-posix.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/qemu-thread-posix.c b/qemu-thread-posix.c
+index 6374df3..4489abf 100644
+--- qemu-thread-posix.c
++++ qemu-thread-posix.c
+@@ -213,6 +213,7 @@ int qemu_sem_timedwait(QemuSemaphore *sem, int ms)
+     while (sem->count < 0) {
+         rc = pthread_cond_timedwait(&sem->cond, &sem->lock, &ts);
+         if (rc == ETIMEDOUT) {
++            ++sem->count;
+             break;
+         }
+         if (rc != 0) {
+-- 
+1.8.1
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130109/54e8a901/attachment.html>