[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 1/5] xenfb: Unregister keyboard event handler
From: |
Stefano Stabellini |
Subject: |
Re: [Qemu-devel] [PATCH v2 1/5] xenfb: Unregister keyboard event handler correctly |
Date: |
Fri, 26 Sep 2014 16:10:54 +0100 |
User-agent: |
Alpine 2.02 (DEB 1266 2009-07-14) |
On Wed, 17 Sep 2014, Owen smith wrote:
> The keyboard event handler was not being removed, a NULL-callback
> entry was being added to intercept events. Use the unregister call
> to remove the keyboard event handler when appropriate.
>
> Signed-off-by: Owen smith <address@hidden>
Acked-by: Stefano Stabellini <address@hidden>
> hw/display/xenfb.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c
> index 07ddc9d..9dcf9b6 100644
> --- a/hw/display/xenfb.c
> +++ b/hw/display/xenfb.c
> @@ -62,6 +62,7 @@ struct XenInput {
> int abs_pointer_wanted; /* Whether guest supports absolute pointer */
> int button_state; /* Last seen pointer button state */
> int extended;
> + QEMUPutKbdEntry *qkbd;
> QEMUPutMouseEntry *qmouse;
> };
>
> @@ -364,7 +365,6 @@ static int input_initialise(struct XenDevice *xendev)
> if (rc != 0)
> return rc;
>
> - qemu_add_kbd_event_handler(xenfb_key_event, in);
> return 0;
> }
>
> @@ -383,6 +383,11 @@ static void input_connected(struct XenDevice *xendev)
> in->qmouse = qemu_add_mouse_event_handler(xenfb_mouse_event, in,
> in->abs_pointer_wanted,
> "Xen PVFB Mouse");
> +
> + if (in->qkbd) {
> + qemu_remove_kbd_event_handler(in->qkbd);
> + }
> + in->qkbd = qemu_add_kbd_event_handler(xenfb_key_event, in);
> }
>
> static void input_disconnect(struct XenDevice *xendev)
> @@ -393,7 +398,10 @@ static void input_disconnect(struct XenDevice *xendev)
> qemu_remove_mouse_event_handler(in->qmouse);
> in->qmouse = NULL;
> }
> - qemu_add_kbd_event_handler(NULL, NULL);
> + if (in->qkbd) {
> + qemu_remove_kbd_event_handler(in->qkbd);
> + in->qkbd = NULL;
> + }
> common_unbind(&in->c);
> }
>
> --
> 2.1.0
>
- [Qemu-devel] [PATCH v2 0/5] xenfb: Add support for Windows PV frontend, Owen smith, 2014/09/17
- [Qemu-devel] [PATCH v2 2/5] xenfb: Activate mouse event handler, Owen smith, 2014/09/17
- [Qemu-devel] [PATCH v2 1/5] xenfb: Unregister keyboard event handler correctly, Owen smith, 2014/09/17
- Re: [Qemu-devel] [PATCH v2 1/5] xenfb: Unregister keyboard event handler correctly,
Stefano Stabellini <=
- [Qemu-devel] [PATCH v2 3/5] xenfb: Add option to use a grant ref for shared page, Owen smith, 2014/09/17
- [Qemu-devel] [PATCH v2 4/5] xenfb: Add "feature-no-abs-rescale", Owen smith, 2014/09/17
- [Qemu-devel] [PATCH v2 5/5] xenfb: Add "feature-no-console", Owen smith, 2014/09/17