Merge remote-tracking branch 'remotes/kraxel/tags/vga-20191220-pull-request' into...

[qemu.git] / chardev / char-fe.c

diff --git a/chardev/char-fe.c b/chardev/char-fe.c
index f158f158f818c29f9ccca19c4766951105d650d3..f3530a90e6364d813097105b611326afd7903b41 100644 (file)
--- a/chardev/char-fe.c
+++ b/chardev/char-fe.c
@@ -235,20 +235,26 @@ void qemu_chr_fe_deinit(CharBackend *b, bool del)
             d->backends[b->tag] = NULL;
         }
         if (del) {
             d->backends[b->tag] = NULL;
         }
         if (del) {

-            object_unparent(OBJECT(b->chr));
+            Object *obj = OBJECT(b->chr);
+            if (obj->parent) {
+                object_unparent(obj);
+            } else {
+                object_unref(obj);
+            }

         }
         b->chr = NULL;
     }
 }
 
         }
         b->chr = NULL;
     }
 }
 

-void qemu_chr_fe_set_handlers(CharBackend *b,
-                              IOCanReadHandler *fd_can_read,
-                              IOReadHandler *fd_read,
-                              IOEventHandler *fd_event,
-                              BackendChangeHandler *be_change,
-                              void *opaque,
-                              GMainContext *context,
-                              bool set_open)
+void qemu_chr_fe_set_handlers_full(CharBackend *b,
+                                   IOCanReadHandler *fd_can_read,
+                                   IOReadHandler *fd_read,
+                                   IOEventHandler *fd_event,
+                                   BackendChangeHandler *be_change,
+                                   void *opaque,
+                                   GMainContext *context,
+                                   bool set_open,
+                                   bool sync_state)

 {
     Chardev *s;
     int fe_open;
 {
     Chardev *s;
     int fe_open;


@@ -280,14 +286,24 @@ void qemu_chr_fe_set_handlers(CharBackend *b,
         qemu_chr_fe_take_focus(b);
         /* We're connecting to an already opened device, so let's make sure we
            also get the open event */
         qemu_chr_fe_take_focus(b);
         /* We're connecting to an already opened device, so let's make sure we
            also get the open event */

-        if (s->be_open) {
+        if (sync_state && s->be_open) {

             qemu_chr_be_event(s, CHR_EVENT_OPENED);
         }
     }
             qemu_chr_be_event(s, CHR_EVENT_OPENED);
         }
     }

+}

 
 

-    if (CHARDEV_IS_MUX(s)) {
-        mux_chr_set_handlers(s, context);
-    }
+void qemu_chr_fe_set_handlers(CharBackend *b,
+                              IOCanReadHandler *fd_can_read,
+                              IOReadHandler *fd_read,
+                              IOEventHandler *fd_event,
+                              BackendChangeHandler *be_change,
+                              void *opaque,
+                              GMainContext *context,
+                              bool set_open)
+{
+    qemu_chr_fe_set_handlers_full(b, fd_can_read, fd_read, fd_event, be_change,
+                                  opaque, context, set_open,
+                                  true);

 }
 
 void qemu_chr_fe_take_focus(CharBackend *b)
 }
 
 void qemu_chr_fe_take_focus(CharBackend *b)