From 85d91e3295f3af21e4d4a19f1f6691c0bf2ed10c Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 26 Mar 2013 11:07:59 +0100 Subject: [PATCH] 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 Message-id: 1364292483-16564-8-git-send-email-hdegoede@redhat.com Signed-off-by: Anthony Liguori --- hw/qdev-properties-system.c | 6 ++++-- qemu-char.c | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/qdev-properties-system.c b/hw/qdev-properties-system.c index 28813d3978..d9934b5b9c 100644 --- 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 bab2eb7a9a..ca9381bc0c 100644 --- 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; -- 2.11.4.GIT