From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51255) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMCna-000691-JW for qemu-devel@nongnu.org; Tue, 26 Aug 2014 05:12:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XMCnT-00059K-GT for qemu-devel@nongnu.org; Tue, 26 Aug 2014 05:12:18 -0400 Received: from mail-qg0-x229.google.com ([2607:f8b0:400d:c04::229]:49265) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMCnT-000596-D3 for qemu-devel@nongnu.org; Tue, 26 Aug 2014 05:12:11 -0400 Received: by mail-qg0-f41.google.com with SMTP id z107so10972880qgd.14 for ; Tue, 26 Aug 2014 02:12:11 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <53FC4F65.9070109@redhat.com> Date: Tue, 26 Aug 2014 11:12:05 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <20140826071427.1672.48119.stgit@PASHA-ISP> <20140826071514.1672.75677.stgit@PASHA-ISP> In-Reply-To: <20140826071514.1672.75677.stgit@PASHA-ISP> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 08/12] pckbd: adding new fields to vmstate List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Pavel Dovgalyuk , qemu-devel@nongnu.org Cc: zealot351@gmail.com, maria.klimushenkova@ispras.ru Il 26/08/2014 09:15, Pavel Dovgalyuk ha scritto: > This patch adds outport to VMState to allow correct saving and restoring > the state of PC keyboard controller. > > Signed-off-by: Pavel Dovgalyuk > --- > hw/input/pckbd.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 51 insertions(+), 0 deletions(-) > > diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c > index ca1cffc..95d8767 100644 > --- a/hw/input/pckbd.c > +++ b/hw/input/pckbd.c > @@ -131,6 +131,7 @@ typedef struct KBDState { > uint8_t status; > uint8_t mode; > uint8_t outport; > + bool outport_present; > /* Bitmask of devices with data available. */ > uint8_t pending; > void *kbd; > @@ -367,18 +368,68 @@ static void kbd_reset(void *opaque) > s->mode = KBD_MODE_KBD_INT | KBD_MODE_MOUSE_INT; > s->status = KBD_STAT_CMD | KBD_STAT_UNLOCKED; > s->outport = KBD_OUT_RESET | KBD_OUT_A20; > + s->outport_present = false; > +} > + > +static uint8_t kbd_outport_default(KBDState *s) > +{ > + return KBD_OUT_RESET | KBD_OUT_A20 > + | (s->status & KBD_STAT_OBF ? KBD_OUT_OBF : 0) > + | (s->status & KBD_STAT_MOUSE_OBF ? KBD_OUT_MOUSE_OBF : 0); > +} > + > +static int kbd_outport_post_load(void *opaque, int version_id) > +{ > + KBDState *s = opaque; > + s->outport_present = true; > + return 0; > +} > + > +static const VMStateDescription vmstate_kbd_outport = { > + .name = "pckbd_outport", > + .version_id = 1, > + .minimum_version_id = 1, > + .post_load = kbd_outport_post_load, > + .fields = (VMStateField[]) { > + VMSTATE_UINT8(outport, KBDState), > + VMSTATE_END_OF_LIST() > + } > +}; > + > +static bool kbd_outport_needed(void *opaque) > +{ > + KBDState *s = opaque; > + return s->outport != kbd_outport_default(s); > +} > + > +static int kbd_post_load(void *opaque, int version_id) > +{ > + KBDState *s = opaque; > + if (!s->outport_present) { > + s->outport = kbd_outport_default(s); > + } > + s->outport_present = false; > + return 0; > } > > static const VMStateDescription vmstate_kbd = { > .name = "pckbd", > .version_id = 3, > .minimum_version_id = 3, > + .post_load = kbd_post_load, > .fields = (VMStateField[]) { > VMSTATE_UINT8(write_cmd, KBDState), > VMSTATE_UINT8(status, KBDState), > VMSTATE_UINT8(mode, KBDState), > VMSTATE_UINT8(pending, KBDState), > VMSTATE_END_OF_LIST() > + }, > + .subsections = (VMStateSubsection[]) { > + { > + .vmsd = &vmstate_kbd_outport, > + .needed = kbd_outport_needed, > + }, > + VMSTATE_END_OF_LIST() > } > }; > > > > Reviewed-by: Paolo Bonzini