Patchwork [1/7] io-thread: make sure to initialize qemu_work_cond and qemu_cpu_cond

login
register
mail settings
Submitter Anthony Liguori
Date Jan. 24, 2011, 9 p.m.
Message ID <1295902845-29807-2-git-send-email-aliguori@us.ibm.com>
Download mbox | patch
Permalink /patch/80245/
State New
Headers show

Comments

Anthony Liguori - Jan. 24, 2011, 9 p.m.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Jan Kiszka - Feb. 8, 2011, 8:53 a.m.
On 2011-01-24 22:00, Anthony Liguori wrote:
> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
> 
> diff --git a/cpus.c b/cpus.c
> index 0309189..9cf7e6e 100644
> --- a/cpus.c
> +++ b/cpus.c
> @@ -412,8 +412,10 @@ int qemu_init_main_loop(void)
>      if (ret)
>          return ret;
>  
> -    qemu_cond_init(&qemu_pause_cond);
> +    qemu_cond_init(&qemu_cpu_cond);
>      qemu_cond_init(&qemu_system_cond);
> +    qemu_cond_init(&qemu_pause_cond);
> +    qemu_cond_init(&qemu_work_cond);
>      qemu_mutex_init(&qemu_fair_mutex);
>      qemu_mutex_init(&qemu_global_mutex);
>      qemu_mutex_lock(&qemu_global_mutex);

Please merge this independently of the glib patches. It's apparently
harmless only by chance so far.

Thanks,
Jan
Anthony Liguori - Feb. 8, 2011, 9:01 a.m.
On 02/08/2011 02:53 AM, Jan Kiszka wrote:
> On 2011-01-24 22:00, Anthony Liguori wrote:
>    
>> Signed-off-by: Anthony Liguori<aliguori@us.ibm.com>
>>
>> diff --git a/cpus.c b/cpus.c
>> index 0309189..9cf7e6e 100644
>> --- a/cpus.c
>> +++ b/cpus.c
>> @@ -412,8 +412,10 @@ int qemu_init_main_loop(void)
>>       if (ret)
>>           return ret;
>>
>> -    qemu_cond_init(&qemu_pause_cond);
>> +    qemu_cond_init(&qemu_cpu_cond);
>>       qemu_cond_init(&qemu_system_cond);
>> +    qemu_cond_init(&qemu_pause_cond);
>> +    qemu_cond_init(&qemu_work_cond);
>>       qemu_mutex_init(&qemu_fair_mutex);
>>       qemu_mutex_init(&qemu_global_mutex);
>>       qemu_mutex_lock(&qemu_global_mutex);
>>      
> Please merge this independently of the glib patches. It's apparently
> harmless only by chance so far.
>    

Plan is to merge the first and second patch of the series right after 
0.14.0 is released.

Regards,

Anthony Liguori


> Thanks,
> Jan
>
>

Patch

diff --git a/cpus.c b/cpus.c
index 0309189..9cf7e6e 100644
--- a/cpus.c
+++ b/cpus.c
@@ -412,8 +412,10 @@  int qemu_init_main_loop(void)
     if (ret)
         return ret;
 
-    qemu_cond_init(&qemu_pause_cond);
+    qemu_cond_init(&qemu_cpu_cond);
     qemu_cond_init(&qemu_system_cond);
+    qemu_cond_init(&qemu_pause_cond);
+    qemu_cond_init(&qemu_work_cond);
     qemu_mutex_init(&qemu_fair_mutex);
     qemu_mutex_init(&qemu_global_mutex);
     qemu_mutex_lock(&qemu_global_mutex);