[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/7] usb-serial: Remove double call to qemu_chr_add_
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 1/7] usb-serial: Remove double call to qemu_chr_add_handlers( NULL ) |
Date: |
Tue, 16 Apr 2013 12:13:04 +0200 |
From: Hans de Goede <address@hidden>
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);
CharDriverState *chr = *ptr;
if (chr) {
qemu_chr_add_handlers(chr, NULL, NULL, NULL, NULL);
qemu_chr_fe_release(chr);
}
}
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.
Signed-off-by: Hans de Goede <address@hidden>
Signed-off-by: Gerd Hoffmann <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 dd0a608..2fc8a3b 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.7.9.7
- [Qemu-devel] [PULL 0/7] usb patch queue, Gerd Hoffmann, 2013/04/16
- [Qemu-devel] [PATCH 3/7] xhci: add xhci_cap_write, Gerd Hoffmann, 2013/04/16
- [Qemu-devel] [PATCH 4/7] xhci: fix portsc writes, Gerd Hoffmann, 2013/04/16
- [Qemu-devel] [PATCH 5/7] xhci: use slotid as device address, Gerd Hoffmann, 2013/04/16
- [Qemu-devel] [PATCH 1/7] usb-serial: Remove double call to qemu_chr_add_handlers( NULL ),
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 2/7] xhci: remove leftover debug printf, Gerd Hoffmann, 2013/04/16
- [Qemu-devel] [PATCH 6/7] xhci: fix address device, Gerd Hoffmann, 2013/04/16
- [Qemu-devel] [PATCH 7/7] use libusb for usb-host, Gerd Hoffmann, 2013/04/16