From patchwork Thu Sep 10 01:04:34 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 33250 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4C4C3B707B for ; Thu, 10 Sep 2009 11:29:27 +1000 (EST) Received: from localhost ([127.0.0.1]:45529 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlYTU-0005GE-Ac for incoming@patchwork.ozlabs.org; Wed, 09 Sep 2009 21:29:24 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MlY68-0004X8-RB for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:05:17 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MlY62-0004Sk-4z for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:05:14 -0400 Received: from [199.232.76.173] (port=48261 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlY60-0004S4-Td for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:05:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:31609) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MlY60-0002md-7q for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:05:08 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8A157oi019593 for ; Wed, 9 Sep 2009 21:05:07 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8A14oog020882; Wed, 9 Sep 2009 21:05:06 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Thu, 10 Sep 2009 03:04:34 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 13/26] vmstate: port fw_cfg device X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Juan Quintela --- hw/fw_cfg.c | 33 ++++++++++++--------------------- 1 files changed, 12 insertions(+), 21 deletions(-) diff --git a/hw/fw_cfg.c b/hw/fw_cfg.c index 85f433a..37fe3b3 100644 --- a/hw/fw_cfg.c +++ b/hw/fw_cfg.c @@ -164,26 +164,17 @@ static void fw_cfg_reset(void *opaque) fw_cfg_select(s, 0); } -static void fw_cfg_save(QEMUFile *f, void *opaque) -{ - FWCfgState *s = opaque; - - qemu_put_be16s(f, &s->cur_entry); - qemu_put_be16s(f, &s->cur_offset); -} - -static int fw_cfg_load(QEMUFile *f, void *opaque, int version_id) -{ - FWCfgState *s = opaque; - - if (version_id > 1) - return -EINVAL; - - qemu_get_be16s(f, &s->cur_entry); - qemu_get_be16s(f, &s->cur_offset); - - return 0; -} +static const VMStateDescription vmstate_fw_cfg = { + .name = "fw_cfg", + .version_id = 1, + .minimum_version_id = 1, + .minimum_version_id_old = 1, + .fields = (VMStateField []) { + VMSTATE_UINT16(cur_entry, FWCfgState), + VMSTATE_UINT16(cur_offset, FWCfgState), + VMSTATE_END_OF_LIST() + } +}; int fw_cfg_add_bytes(void *opaque, uint16_t key, uint8_t *data, uint16_t len) { @@ -282,7 +273,7 @@ void *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, fw_cfg_add_i16(s, FW_CFG_MAX_CPUS, (uint16_t)max_cpus); fw_cfg_add_i16(s, FW_CFG_BOOT_MENU, (uint16_t)boot_menu); - register_savevm("fw_cfg", -1, 1, fw_cfg_save, fw_cfg_load, s); + vmstate_register(-1, &vmstate_fw_cfg, s); qemu_register_reset(fw_cfg_reset, s); fw_cfg_reset(s);