From: Anthony Liguori <aliguori@us.ibm.com>
Date: Wed, 16 Feb 2011 14:47:07 +0000 (-0600)
Subject: Merge remote branch 'qemu-kvm/uq/master' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c5d69e6bbf37bf5e3882060764b15e018e6a5321;p=qemu.git

Merge remote branch 'qemu-kvm/uq/master' into staging
---

c5d69e6bbf37bf5e3882060764b15e018e6a5321
diff --cc cpus.c
index 2d920907e0,468544cc3a..0f339459a5
--- a/cpus.c
+++ b/cpus.c
@@@ -409,13 -687,12 +687,14 @@@ int qemu_init_main_loop(void
  
      /* Note eventfd must be drained before signalfd handlers run */
      ret = qemu_event_init();
-     if (ret)
+     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);