SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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 <hdegoede@redhat.com>
Message-id: 1364292483-16564-8-git-send-email-hdegoede@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Hans de Goede 2013-03-26 11:07:59 +01:00 committed by Anthony Liguori
parent 574b711a92
commit 85d91e3295
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/qdev-properties-system.c
View File

@ -136,9 +136,11 @@ static void release_chr(Object *obj, const char *name, void *opaque)
DeviceState *dev = DEVICE(obj); DeviceState *dev = DEVICE(obj);
Property *prop = opaque; Property *prop = opaque;
CharDriverState **ptr = qdev_get_prop_ptr(dev, prop); CharDriverState **ptr = qdev_get_prop_ptr(dev, prop);
CharDriverState *chr = *ptr;
if (*ptr) { if (chr) {
qemu_chr_add_handlers(*ptr, NULL, NULL, NULL, NULL); qemu_chr_add_handlers(chr, NULL, NULL, NULL, NULL);
++chr->avail_connections;
} }
} }

2
qemu-char.c
View File

@ -224,8 +224,6 @@ void qemu_chr_add_handlers(CharDriverState *s,
int fe_open; int fe_open;
if (!opaque && !fd_can_read && !fd_read && !fd_event) { if (!opaque && !fd_can_read && !fd_read && !fd_event) {
/* chr driver being released. */
++s->avail_connections;
fe_open = 0; fe_open = 0;
} else { } else {
fe_open = 1; fe_open = 1;