From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=58927 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OOGir-0008DV-G0 for qemu-devel@nongnu.org; Mon, 14 Jun 2010 16:57:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OOGiq-0007tM-7X for qemu-devel@nongnu.org; Mon, 14 Jun 2010 16:57:33 -0400 Received: from mail-iw0-f173.google.com ([209.85.214.173]:56474) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OOGiq-0007ly-3P for qemu-devel@nongnu.org; Mon, 14 Jun 2010 16:57:32 -0400 Received: by mail-iw0-f173.google.com with SMTP id 10so4582648iwn.4 for ; Mon, 14 Jun 2010 13:57:31 -0700 (PDT) Message-ID: <4C1697BD.70706@codemonkey.ws> Date: Mon, 14 Jun 2010 15:57:33 -0500 From: Anthony Liguori MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH] un-register kbd driver in case of USB kbd unplug. References: <1276002738-821-1-git-send-email-Jes.Sorensen@redhat.com> <1276002738-821-2-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1276002738-821-2-git-send-email-Jes.Sorensen@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jes.Sorensen@redhat.com Cc: kwolf@redhat.com, shavivi@redhat.com, qemu-devel@nongnu.org On 06/08/2010 08:12 AM, Jes.Sorensen@redhat.com wrote: > From: Jes Sorensen > > If a USB keyboard is unplugged, the keyboard eventhandler is never > removed, and events will continue to be passed through to the device, > causing crashes or memory corruption. > > Signed-off-by: Jes Sorensen > Applied. Thanks. Regards, Anthony Liguori > --- > console.h | 1 + > hw/usb-hid.c | 8 ++++++-- > input.c | 6 ++++++ > 3 files changed, 13 insertions(+), 2 deletions(-) > > diff --git a/console.h b/console.h > index cac959f..aafb031 100644 > --- a/console.h > +++ b/console.h > @@ -42,6 +42,7 @@ typedef struct QEMUPutLEDEntry { > } QEMUPutLEDEntry; > > void qemu_add_kbd_event_handler(QEMUPutKBDEvent *func, void *opaque); > +void qemu_remove_kbd_event_handler(void); > QEMUPutMouseEntry *qemu_add_mouse_event_handler(QEMUPutMouseEvent *func, > void *opaque, int absolute, > const char *name); > diff --git a/hw/usb-hid.c b/hw/usb-hid.c > index 8e6c6e0..ca04511 100644 > --- a/hw/usb-hid.c > +++ b/hw/usb-hid.c > @@ -854,9 +854,13 @@ static void usb_hid_handle_destroy(USBDevice *dev) > { > USBHIDState *s = (USBHIDState *)dev; > > - if (s->kind != USB_KEYBOARD) > + switch(s->kind) { > + case USB_KEYBOARD: > + qemu_remove_kbd_event_handler(); > + break; > + default: > qemu_remove_mouse_event_handler(s->ptr.eh_entry); > - /* TODO: else */ > + } > } > > static int usb_hid_initfn(USBDevice *dev, int kind) > diff --git a/input.c b/input.c > index 651442d..ec05548 100644 > --- a/input.c > +++ b/input.c > @@ -42,6 +42,12 @@ void qemu_add_kbd_event_handler(QEMUPutKBDEvent *func, void *opaque) > qemu_put_kbd_event = func; > } > > +void qemu_remove_kbd_event_handler(void) > +{ > + qemu_put_kbd_event_opaque = NULL; > + qemu_put_kbd_event = NULL; > +} > + > static void check_mode_change(void) > { > static int current_is_absolute, current_has_absolute; >