diff mbox

w32: Add missing functions qemu_mutex_destroy, qemu_cond_destroy

Message ID 1300039252-27156-1-git-send-email-weil@mail.berlios.de
State Accepted
Headers show

Commit Message

Stefan Weil March 13, 2011, 6 p.m. UTC
These functions were missing in commit
9257d46d55f1fe4e8209be9a6870e339ac3266fe.

Both functions are needed for compilations with
configuration --enable-vnc-thread.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Blue Swirl <blauwirbel@gmail.com>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---
 qemu-thread-win32.c |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

Comments

Stefan Weil March 18, 2011, 10:39 p.m. UTC | #1
Am 13.03.2011 19:00, schrieb Stefan Weil:
> These functions were missing in commit
> 9257d46d55f1fe4e8209be9a6870e339ac3266fe.
>
> Both functions are needed for compilations with
> configuration --enable-vnc-thread.
>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Blue Swirl <blauwirbel@gmail.com>
> Signed-off-by: Stefan Weil <weil@mail.berlios.de>
> ---
> qemu-thread-win32.c | 21 +++++++++++++++++++++
> 1 files changed, 21 insertions(+), 0 deletions(-)
>
> diff --git a/qemu-thread-win32.c b/qemu-thread-win32.c
> index 2edcb1a..2d2d5ab 100644
> --- a/qemu-thread-win32.c
> +++ b/qemu-thread-win32.c
> @@ -33,6 +33,12 @@ void qemu_mutex_init(QemuMutex *mutex)
> InitializeCriticalSection(&mutex->lock);
> }
>
> +void qemu_mutex_destroy(QemuMutex *mutex)
> +{
> + assert(mutex->owner == 0);
> + DeleteCriticalSection(&mutex->lock);
> +}
> +
> void qemu_mutex_lock(QemuMutex *mutex)
> {
> EnterCriticalSection(&mutex->lock);
> @@ -80,6 +86,21 @@ void qemu_cond_init(QemuCond *cond)
> }
> }
>
> +void qemu_cond_destroy(QemuCond *cond)
> +{
> + BOOL result;
> + result = CloseHandle(cond->continue_event);
> + if (!result) {
> + error_exit(GetLastError(), __func__);
> + }
> + cond->continue_event = 0;
> + result = CloseHandle(cond->sema);
> + if (!result) {
> + error_exit(GetLastError(), __func__);
> + }
> + cond->sema = 0;
> +}
> +
> void qemu_cond_signal(QemuCond *cond)
> {
> DWORD result;

No comments? Why is is so difficult to get compilation problems fixed?
Blue Swirl March 19, 2011, 8:38 a.m. UTC | #2
Thanks, applied.

On Sat, Mar 19, 2011 at 12:39 AM, Stefan Weil <weil@mail.berlios.de> wrote:
> Am 13.03.2011 19:00, schrieb Stefan Weil:
>>
>> These functions were missing in commit
>> 9257d46d55f1fe4e8209be9a6870e339ac3266fe.
>>
>> Both functions are needed for compilations with
>> configuration --enable-vnc-thread.
>>
>> Cc: Paolo Bonzini <pbonzini@redhat.com>
>> Cc: Blue Swirl <blauwirbel@gmail.com>
>> Signed-off-by: Stefan Weil <weil@mail.berlios.de>
>> ---
>> qemu-thread-win32.c | 21 +++++++++++++++++++++
>> 1 files changed, 21 insertions(+), 0 deletions(-)
>>
>> diff --git a/qemu-thread-win32.c b/qemu-thread-win32.c
>> index 2edcb1a..2d2d5ab 100644
>> --- a/qemu-thread-win32.c
>> +++ b/qemu-thread-win32.c
>> @@ -33,6 +33,12 @@ void qemu_mutex_init(QemuMutex *mutex)
>> InitializeCriticalSection(&mutex->lock);
>> }
>>
>> +void qemu_mutex_destroy(QemuMutex *mutex)
>> +{
>> + assert(mutex->owner == 0);
>> + DeleteCriticalSection(&mutex->lock);
>> +}
>> +
>> void qemu_mutex_lock(QemuMutex *mutex)
>> {
>> EnterCriticalSection(&mutex->lock);
>> @@ -80,6 +86,21 @@ void qemu_cond_init(QemuCond *cond)
>> }
>> }
>>
>> +void qemu_cond_destroy(QemuCond *cond)
>> +{
>> + BOOL result;
>> + result = CloseHandle(cond->continue_event);
>> + if (!result) {
>> + error_exit(GetLastError(), __func__);
>> + }
>> + cond->continue_event = 0;
>> + result = CloseHandle(cond->sema);
>> + if (!result) {
>> + error_exit(GetLastError(), __func__);
>> + }
>> + cond->sema = 0;
>> +}
>> +
>> void qemu_cond_signal(QemuCond *cond)
>> {
>> DWORD result;
>
> No comments? Why is is so difficult to get compilation problems fixed?
>
diff mbox

Patch

diff --git a/qemu-thread-win32.c b/qemu-thread-win32.c
index 2edcb1a..2d2d5ab 100644
--- a/qemu-thread-win32.c
+++ b/qemu-thread-win32.c
@@ -33,6 +33,12 @@  void qemu_mutex_init(QemuMutex *mutex)
     InitializeCriticalSection(&mutex->lock);
 }
 
+void qemu_mutex_destroy(QemuMutex *mutex)
+{
+    assert(mutex->owner == 0);
+    DeleteCriticalSection(&mutex->lock);
+}
+
 void qemu_mutex_lock(QemuMutex *mutex)
 {
     EnterCriticalSection(&mutex->lock);
@@ -80,6 +86,21 @@  void qemu_cond_init(QemuCond *cond)
     }
 }
 
+void qemu_cond_destroy(QemuCond *cond)
+{
+    BOOL result;
+    result = CloseHandle(cond->continue_event);
+    if (!result) {
+        error_exit(GetLastError(), __func__);
+    }
+    cond->continue_event = 0;
+    result = CloseHandle(cond->sema);
+    if (!result) {
+        error_exit(GetLastError(), __func__);
+    }
+    cond->sema = 0;
+}
+
 void qemu_cond_signal(QemuCond *cond)
 {
     DWORD result;