From patchwork Wed Oct 12 17:17:57 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Fergeau X-Patchwork-Id: 119259 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 28E80B6F77 for ; Thu, 13 Oct 2011 04:18:23 +1100 (EST) Received: from localhost ([::1]:58688 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RE2RW-0000tr-AK for incoming@patchwork.ozlabs.org; Wed, 12 Oct 2011 13:18:10 -0400 Received: from eggs.gnu.org ([140.186.70.92]:56662) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RE2RQ-0000tf-G2 for qemu-devel@nongnu.org; Wed, 12 Oct 2011 13:18:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RE2RP-00040V-53 for qemu-devel@nongnu.org; Wed, 12 Oct 2011 13:18:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56705) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RE2RO-000401-KB for qemu-devel@nongnu.org; Wed, 12 Oct 2011 13:18:03 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p9CHHxWC021588 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 12 Oct 2011 13:18:00 -0400 Received: from localhost.localdomain (teriyaki.cdg.redhat.com [10.32.192.15]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p9CHHvBQ001571 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 12 Oct 2011 13:17:59 -0400 From: Christophe Fergeau To: qemu-devel@nongnu.org Date: Wed, 12 Oct 2011 19:17:57 +0200 Message-Id: <1318439877-26376-1-git-send-email-cfergeau@redhat.com> In-Reply-To: <4E95C37E.20502@codemonkey.ws> References: <4E95C37E.20502@codemonkey.ws> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCHv2] ps2: migrate ledstate X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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. This fixes RH bug #729294 Signed-off-by: Christophe Fergeau --- hw/ps2.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/hw/ps2.c b/hw/ps2.c index 24228c1..3a88681 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; @@ -544,7 +551,7 @@ static void ps2_mouse_reset(void *opaque) static const VMStateDescription vmstate_ps2_common = { .name = "PS2 Common State", - .version_id = 3, + .version_id = 4, .minimum_version_id = 2, .minimum_version_id_old = 2, .fields = (VMStateField []) { @@ -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), VMSTATE_END_OF_LIST() } };