[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 7/7] usb-serial: Remove double call to qemu_chr_add_
From: |
Hans de Goede |
Subject: |
[Qemu-devel] [PATCH 7/7] usb-serial: Remove double call to qemu_chr_add_handlers( NULL ) |
Date: |
Thu, 28 Mar 2013 14:28:17 +0100 |
usb-serial has a qdev chardev property, and hw/qdev-properties-system.c
already contains:
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);
if (*ptr) {
qemu_chr_add_handlers(*ptr, NULL, NULL, NULL, NULL);
}
}
So doing the qemu_chr_add_handlers(s->cs, NULL, NULL, NULL, NULL); from
the usb handle_destroy function too will lead to it being done twice, which
will result in a wrong value for cs->avail_connections.
Signed-off-by: Hans de Goede <address@hidden>
---
hw/usb/dev-serial.c | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c
index 7c314dc..21ddef6 100644
--- a/hw/usb/dev-serial.c
+++ b/hw/usb/dev-serial.c
@@ -410,13 +410,6 @@ static void usb_serial_handle_data(USBDevice *dev,
USBPacket *p)
}
}
-static void usb_serial_handle_destroy(USBDevice *dev)
-{
- USBSerialState *s = (USBSerialState *)dev;
-
- qemu_chr_add_handlers(s->cs, NULL, NULL, NULL, NULL);
-}
-
static int usb_serial_can_read(void *opaque)
{
USBSerialState *s = opaque;
@@ -595,7 +588,6 @@ static void usb_serial_class_initfn(ObjectClass *klass,
void *data)
uc->handle_reset = usb_serial_handle_reset;
uc->handle_control = usb_serial_handle_control;
uc->handle_data = usb_serial_handle_data;
- uc->handle_destroy = usb_serial_handle_destroy;
dc->vmsd = &vmstate_usb_serial;
dc->props = serial_properties;
}
@@ -623,7 +615,6 @@ static void usb_braille_class_initfn(ObjectClass *klass,
void *data)
uc->handle_reset = usb_serial_handle_reset;
uc->handle_control = usb_serial_handle_control;
uc->handle_data = usb_serial_handle_data;
- uc->handle_destroy = usb_serial_handle_destroy;
dc->vmsd = &vmstate_usb_serial;
dc->props = braille_properties;
}
--
1.8.1.4
- [Qemu-devel] [PATCH 0/7] Spice / usb-redir chardev flowcontrol patches v3, Hans de Goede, 2013/03/28
- [Qemu-devel] [PATCH 1/7] virtio-console: Also throttle when less was written then requested, Hans de Goede, 2013/03/28
- [Qemu-devel] [PATCH 5/7] spice-qemu-char: Remove intermediate buffer, Hans de Goede, 2013/03/28
- [Qemu-devel] [PATCH 3/7] spice-qemu-char: Remove #ifdef-ed code for old spice-server compat, Hans de Goede, 2013/03/28
- [Qemu-devel] [PATCH 4/7] spice-qemu-char: Add watch support, Hans de Goede, 2013/03/28
- [Qemu-devel] [PATCH 6/7] usb-redir: Add flow control support, Hans de Goede, 2013/03/28
- [Qemu-devel] [PATCH 2/7] virtio-console: Remove any pending watches on close, Hans de Goede, 2013/03/28
- [Qemu-devel] [PATCH 7/7] usb-serial: Remove double call to qemu_chr_add_handlers( NULL ),
Hans de Goede <=