qemu-char: Move incrementing of avail_connections to qdev-properties-system

The decrement of avail_connections is done in qdev-properties-system move
the increment there too for proper balancing of the calls.

Signed-off-by: Hans de Goede <[email protected]>
Message-id: 1364292483[email protected]
Signed-off-by: Anthony Liguori <[email protected]>

diff --git a/hw/qdev-properties-system.c b/hw/qdev-properties-system.c
index 28813d397820eca211f3553b81ff584d94c3101e..d9934b5b9c0748acd1681abfd472aba13447dd18 100644 (file)
--- a/hw/qdev-properties-system.c
+++ b/hw/qdev-properties-system.c
@@ -136,9 +136,11 @@ static void release_chr(Object *obj, const char *name, void *opaque)
     DeviceState *dev = DEVICE(obj);
     Property *prop = opaque;
     CharDriverState **ptr = qdev_get_prop_ptr(dev, prop);
+    CharDriverState *chr = *ptr;
 
-    if (*ptr) {
-        qemu_chr_add_handlers(*ptr, NULL, NULL, NULL, NULL);
+    if (chr) {
+        qemu_chr_add_handlers(chr, NULL, NULL, NULL, NULL);
+        ++chr->avail_connections;
     }
 }
 

diff --git a/qemu-char.c b/qemu-char.c
index bab2eb7a9ab54aef7fca31c9817ef338a37fa142..ca9381bc0c485083017b82d5a372f4eed725e696 100644 (file)
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -224,8 +224,6 @@ void qemu_chr_add_handlers(CharDriverState *s,
     int fe_open;
 
     if (!opaque && !fd_can_read && !fd_read && !fd_event) {
-        /* chr driver being released. */
-        ++s->avail_connections;
         fe_open = 0;
     } else {
         fe_open = 1;