From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:44475) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDgyp-00037R-MF for qemu-devel@nongnu.org; Tue, 11 Oct 2011 14:23:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RDgyo-0005se-EM for qemu-devel@nongnu.org; Tue, 11 Oct 2011 14:23:07 -0400 Received: from mail-ww0-f53.google.com ([74.125.82.53]:43804) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDgyo-0005sY-9K for qemu-devel@nongnu.org; Tue, 11 Oct 2011 14:23:06 -0400 Received: by wwg14 with SMTP id 14so9470432wwg.10 for ; Tue, 11 Oct 2011 11:23:05 -0700 (PDT) Message-ID: <4E948984.10505@codemonkey.ws> Date: Tue, 11 Oct 2011 13:23:00 -0500 From: Anthony Liguori MIME-Version: 1.0 References: <1318350500-13896-1-git-send-email-alevy@redhat.com> In-Reply-To: <1318350500-13896-1-git-send-email-alevy@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] spice-input: migrate ledstate List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alon Levy Cc: qemu-devel@nongnu.org, cfergeau@redhat.com, kraxel@redhat.com On 10/11/2011 11:28 AM, Alon Levy wrote: > The caps/scroll/num lock state is not tracked by the ps2 device, but by > spice-input QemuSpiceKbd->ledstate. To fix losing it across migration, > and then having the server send caps/scroll/nums keys when the client > sends a SPICE_MSGC_INPUTS_KEY_MODIFIERS, migrate it. > > RHBZ# 729294 > > Signed-off-by: Alon Levy > --- > trace-events | 3 +++ > ui/spice-input.c | 24 ++++++++++++++++++++++++ > 2 files changed, 27 insertions(+), 0 deletions(-) > > diff --git a/trace-events b/trace-events > index 63d8c8e..605dc79 100644 > --- a/trace-events > +++ b/trace-events > @@ -538,3 +538,6 @@ esp_mem_writeb_cmd_ensel(uint32_t val) "Enable selection (%2.2x)" > # monitor.c > handle_qmp_command(void *mon, const char *cmd_name) "mon %p cmd_name \"%s\"" > monitor_protocol_emitter(void *mon) "mon %p" > + > +# ui/spice-input.c > +disable spice_input_post_load(int ledstate) "leds %d" > diff --git a/ui/spice-input.c b/ui/spice-input.c > index af4223d..2f0d3af 100644 > --- a/ui/spice-input.c > +++ b/ui/spice-input.c > @@ -26,6 +26,8 @@ > #include "qemu-common.h" > #include "qemu-spice.h" > #include "console.h" > +#include "hw/hw.h" > +#include "trace.h" > > /* keyboard bits */ > > @@ -195,6 +197,27 @@ static void mouse_mode_notifier(Notifier *notifier, void *data) > pointer->absolute = is_absolute; > } > > +static int qemu_spice_input_post_load(void *opaque, int version_id) > +{ > + QemuSpiceKbd *s = (QemuSpiceKbd *)opaque; > + > + trace_spice_input_post_load(s->ledstate); > + kbd_leds(s, s->ledstate); > + return 0; > +} > + > +static const VMStateDescription vmstate_spice_kbd = { > + .name = "spice-input", > + .version_id = 0, > + .minimum_version_id = 0, > + .minimum_version_id_old = 0, > + .post_load = qemu_spice_input_post_load, > + .fields = (VMStateField[]) { > + VMSTATE_INT32(ledstate, QemuSpiceKbd), > + VMSTATE_END_OF_LIST() > + } > +}; > + This is wrong IMHO. Spice is not a device. Why not just add LED state to the migration of the PS/2 keyboard? Regards, Anthony Liguori > void qemu_spice_input_init(void) > { > QemuSpiceKbd *kbd; > @@ -204,6 +227,7 @@ void qemu_spice_input_init(void) > kbd->sin.base.sif =&kbd_interface.base; > qemu_spice_add_interface(&kbd->sin.base); > qemu_add_led_event_handler(kbd_leds, kbd); > + vmstate_register(NULL, 0,&vmstate_spice_kbd, kbd); > > pointer = g_malloc0(sizeof(*pointer)); > pointer->mouse.base.sif =&mouse_interface.base;