From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49189) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULCpF-0001wq-6j for qemu-devel@nongnu.org; Thu, 28 Mar 2013 09:25:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ULCpD-0007dZ-ES for qemu-devel@nongnu.org; Thu, 28 Mar 2013 09:25:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49269) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULCpD-0007dH-3Q for qemu-devel@nongnu.org; Thu, 28 Mar 2013 09:25:03 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2SDP2pu018050 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 28 Mar 2013 09:25:02 -0400 From: Hans de Goede Date: Thu, 28 Mar 2013 14:28:17 +0100 Message-Id: <1364477297-2083-8-git-send-email-hdegoede@redhat.com> In-Reply-To: <1364477297-2083-1-git-send-email-hdegoede@redhat.com> References: <1364477297-2083-1-git-send-email-hdegoede@redhat.com> Subject: [Qemu-devel] [PATCH 7/7] usb-serial: Remove double call to qemu_chr_add_handlers( NULL ) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann Cc: Amit Shah , Hans de Goede , qemu-devel@nongnu.org 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 --- 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