From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:40752) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RE1tE-0004e5-Dw for qemu-devel@nongnu.org; Wed, 12 Oct 2011 12:42:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RE1tD-00022T-5d for qemu-devel@nongnu.org; Wed, 12 Oct 2011 12:42:44 -0400 Received: from mail-iy0-f173.google.com ([209.85.210.173]:47569) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RE1tD-00022C-2U for qemu-devel@nongnu.org; Wed, 12 Oct 2011 12:42:43 -0400 Received: by iakl21 with SMTP id l21so272269iak.4 for ; Wed, 12 Oct 2011 09:42:42 -0700 (PDT) Message-ID: <4E95C37E.20502@codemonkey.ws> Date: Wed, 12 Oct 2011 11:42:38 -0500 From: Anthony Liguori MIME-Version: 1.0 References: <20111011183036.GL1049@bow.tlv.redhat.com> <1318437328-16865-1-git-send-email-cfergeau@redhat.com> In-Reply-To: <1318437328-16865-1-git-send-email-cfergeau@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] ps2: migrate ledstate List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Christophe Fergeau Cc: qemu-devel@nongnu.org On 10/12/2011 11:35 AM, Christophe Fergeau wrote: > Make the ps2 device track its ledstate so that we can migrate it. > Otherwise it gets lost across migration, and spice-server gets > confused about the actual keyboard state and sends bogus > caps/scroll/num key events. > > Signed-off-by: Christophe Fergeau > --- > hw/ps2.c | 13 +++++++++++-- > 1 files changed, 11 insertions(+), 2 deletions(-) > > diff --git a/hw/ps2.c b/hw/ps2.c > index 24228c1..f19ea18 100644 > --- a/hw/ps2.c > +++ b/hw/ps2.c > @@ -92,6 +92,7 @@ typedef struct { > not the keyboard controller. */ > int translate; > int scancode_set; /* 1=XT, 2=AT, 3=PS/2 */ > + int ledstate; > } PS2KbdState; > > typedef struct { > @@ -195,11 +196,17 @@ uint32_t ps2_read_data(void *opaque) > return val; > } > > +static void ps2_set_ledstate(PS2KbdState *s, int ledstate) > +{ > + s->ledstate = ledstate; > + kbd_put_ledstate(ledstate); > +} > + > static void ps2_reset_keyboard(PS2KbdState *s) > { > s->scan_enabled = 1; > s->scancode_set = 2; > - kbd_put_ledstate(0); > + ps2_set_ledstate(s, 0); > } > > void ps2_write_keyboard(void *opaque, int val) > @@ -274,7 +281,7 @@ void ps2_write_keyboard(void *opaque, int val) > s->common.write_cmd = -1; > break; > case KBD_CMD_SET_LEDS: > - kbd_put_ledstate(val); > + ps2_set_ledstate(s, val); > ps2_queue(&s->common, KBD_REPLY_ACK); > s->common.write_cmd = -1; > break; > @@ -563,6 +570,7 @@ static int ps2_kbd_post_load(void* opaque, int version_id) > > if (version_id == 2) > s->scancode_set=2; > + kbd_put_ledstate(s->ledstate); > return 0; > } > > @@ -577,6 +585,7 @@ static const VMStateDescription vmstate_ps2_keyboard = { > VMSTATE_INT32(scan_enabled, PS2KbdState), > VMSTATE_INT32(translate, PS2KbdState), > VMSTATE_INT32_V(scancode_set, PS2KbdState,3), > + VMSTATE_INT32(ledstate, PS2KbdState), If you're adding a field, you need to bump the version. Regards, Anthony Liguori > VMSTATE_END_OF_LIST() > } > };