diff mbox

[03/20] qemu-char: Fix a race reporting opens and closes

Message ID 1369865296-19584-4-git-send-email-minyard@acm.org
State New
Headers show

Commit Message

Corey Minyard May 29, 2013, 10:07 p.m. UTC 
From: Corey Minyard <cminyard@mvista.com>

When an open event is reported, it is done through a bh.  But close
events are reported immediately.  So if an open event is in the bh
and a close occurs, an extraneous open happens, which can confuse a
user.

To fix this, this patch sets the "opened" flag immediately instead
of in the bh handler and checks to make sure the opened flag is
set before reporting an open event.

This also modifies the spice code to call qemu_chr_generic_open
to report an open, to keep things consistent.

Signed-off-by: Corey Minyard <cminyard@mvista.com>
---
 qemu-char.c       |   18 ++++++++++++++++--
 spice-qemu-char.c |    7 +++++--
 2 files changed, 21 insertions(+), 4 deletions(-)
diff mbox

Patch

diff --git a/qemu-char.c b/qemu-char.c
index 2c34224..76cddd9 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -98,10 +98,13 @@  void qemu_chr_be_event(CharDriverState *s, int event)
     /* Keep track if the char device is open */
     switch (event) {
         case CHR_EVENT_OPENED:
+            /*
+             * See the comment in qemu_chr_generic_open_bh() for why
+             * 's->opened = 1' is not here.
+             */
             if (s->recon_timer) {
                 qemu_del_timer(s->recon_timer);
             }
-            s->be_open = 1;
             break;
         case CHR_EVENT_CLOSED:
             if (s->recon_timer) {
@@ -126,13 +129,24 @@  void qemu_chr_be_event(CharDriverState *s, int event)
 static gboolean qemu_chr_be_generic_open_bh(gpointer opaque)
 {
     CharDriverState *s = opaque;
-    qemu_chr_be_event(s, CHR_EVENT_OPENED);
+    /*
+     * Since the "close" event doesn't go through a bh, there is a
+     * possible race condition if a close comes in after an open, but
+     * the open is in the bh queue.  So we double-check here, and we
+     * set opened in qemu_chr_generic_open() instead of
+     * qemu_chr_be_event().
+     */
+    if (s->be_open) {
+        qemu_chr_be_event(s, CHR_EVENT_OPENED);
+    }
     s->idle_tag = 0;
     return FALSE;
 }
 
 void qemu_chr_be_generic_open(CharDriverState *s)
 {
+    /* See the comment in qemu_chr_generic_open_bh() for why this is here */
+    s->be_open = 1;
     if (s->idle_tag == 0) {
         s->idle_tag = g_idle_add(qemu_chr_be_generic_open_bh, s);
     }
diff --git a/spice-qemu-char.c b/spice-qemu-char.c
index 69c5938..436ab21 100644
--- a/spice-qemu-char.c
+++ b/spice-qemu-char.c
@@ -97,8 +97,11 @@  static void vmc_state(SpiceCharDeviceInstance *sin, int connected)
         return;
     }
 
-    qemu_chr_be_event(scd->chr,
-                      connected ? CHR_EVENT_OPENED : CHR_EVENT_CLOSED);
+    if (connected) {
+        qemu_chr_generic_open(scd->chr);
+    } else {
+        qemu_chr_be_event(scd->chr, CHR_EVENT_CLOSED);
+    }
 }
 
 static SpiceCharDeviceInterface vmc_interface = {