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

diff --cc cpus.c
index 2d920907e0a4cc54637d16afbf139f5a9dd69248,468544cc3ab47353a3900ccb121615f7abbc9bc6..0f339459a59700e49faa3b4453279e19dfc2441c
--- 1/cpus.c
--- 2/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);