From patchwork Fri Nov 13 10:59:20 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 38360 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 ozlabs.org (Postfix) with ESMTPS id 70DE1B7BA7 for ; Fri, 13 Nov 2009 22:00:45 +1100 (EST) Received: from localhost ([127.0.0.1]:59156 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8ttS-0002ZN-4Q for incoming@patchwork.ozlabs.org; Fri, 13 Nov 2009 06:00:42 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N8tsa-0002XT-OD for qemu-devel@nongnu.org; Fri, 13 Nov 2009 05:59:48 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N8tsV-0002Rf-KH for qemu-devel@nongnu.org; Fri, 13 Nov 2009 05:59:47 -0500 Received: from [199.232.76.173] (port=60787 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8tsV-0002RQ-A7 for qemu-devel@nongnu.org; Fri, 13 Nov 2009 05:59:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49301) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N8tsU-0001Fg-P0 for qemu-devel@nongnu.org; Fri, 13 Nov 2009 05:59:43 -0500 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nADAxdwV014910 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 13 Nov 2009 05:59:39 -0500 Received: from localhost (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nADAxb2Y002613; Fri, 13 Nov 2009 05:59:38 -0500 From: Juan Quintela To: Alexander Graf In-Reply-To: <3875BB36-59CF-4EC1-B956-9730A2BCEB74@suse.de> (Alexander Graf's message of "Fri, 13 Nov 2009 07:15:16 +0100") References: <1258059195-17582-1-git-send-email-agraf@suse.de> <1258059195-17582-2-git-send-email-agraf@suse.de> <20091113004818.GE19373@mothafucka.localdomain> <3875BB36-59CF-4EC1-B956-9730A2BCEB74@suse.de> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) Date: Fri, 13 Nov 2009 11:59:20 +0100 Message-ID: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Glauber Costa , Christoph Hellwig , qemu-devel@nongnu.org, Avi Kivity Subject: [Qemu-devel] Re: [PATCH 1/6] Make fw_cfg interface 32-bit aware 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 Alexander Graf wrote: > On 13.11.2009, at 01:48, Glauber Costa wrote: > Because that would mean I'd have to deal with it in the code later on > and I don't see the point of writing code that's not in the load/save > cycle because of limitations there. Hi could you take a look at this one? This don't use the old_state function and should work as well. I haven't tested it yet (test machine down), but will do a bit later. Later, Juan. PD. Yeap, I would have to add the HACK types to hw.h as several places have decided to change the size of several fields. From 25f7a6e401d72a0584fa4630a9dc97ce34520f7b Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Fri, 13 Nov 2009 11:56:38 +0100 Subject: [PATCH] fw_cfg: change cur_offset to 32 bits Signed-off-by: Juan Quintela --- hw/fw_cfg.c | 44 +++++++++++++++++++++++++++++++++++++++----- hw/fw_cfg.h | 2 +- 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/hw/fw_cfg.c b/hw/fw_cfg.c index a6d811b..b79d58f 100644 --- a/hw/fw_cfg.c +++ b/hw/fw_cfg.c @@ -39,7 +39,7 @@ #define FW_CFG_SIZE 2 typedef struct _FWCfgEntry { - uint16_t len; + uint32_t len; uint8_t *data; void *callback_opaque; FWCfgCallback callback; @@ -48,7 +48,7 @@ typedef struct _FWCfgEntry { typedef struct _FWCfgState { FWCfgEntry entries[2][FW_CFG_MAX_ENTRY]; uint16_t cur_entry; - uint16_t cur_offset; + uint32_t cur_offset; } FWCfgState; static void fw_cfg_write(FWCfgState *s, uint8_t value) @@ -164,19 +164,53 @@ static void fw_cfg_reset(void *opaque) fw_cfg_select(s, 0); } +/* Save restore 32 bit int as uint16_t + This is a Big hack, but it is how the old state did it. + Or we broke compatibility in the state, or we can't use struct tm + */ + +static int get_uint32_as_uint16(QEMUFile *f, void *pv, size_t size) +{ + uint32_t *v = pv; + *v = qemu_get_be16(f); + return 0; +} + +static void put_unused(QEMUFile *f, void *pv, size_t size) +{ + fprintf(stderr, "uint32_as_uint16 is only used for backward compatibilty.\n"); + fprintf(stderr, "This functions shouldn't be called.\n"); +} + +const VMStateInfo vmstate_hack_uint32_as_uint16 = { + .name = "int32_as_uint16", + .get = get_uint32_as_uint16, + .put = put_unused, +}; + +#define VMSTATE_UINT16_HACK(_f, _s, _t) \ + VMSTATE_SINGLE_TEST(_f, _s, _t, 0, vmstate_hack_uint32_as_uint16, uint32_t) + + +static bool is_version_1(void *opaque, int version_id) +{ + return version_id == 1; +} + static const VMStateDescription vmstate_fw_cfg = { .name = "fw_cfg", - .version_id = 1, + .version_id = 2, .minimum_version_id = 1, .minimum_version_id_old = 1, .fields = (VMStateField []) { VMSTATE_UINT16(cur_entry, FWCfgState), - VMSTATE_UINT16(cur_offset, FWCfgState), + VMSTATE_UINT16_HACK(cur_offset, FWCfgState, is_version_1), + VMSTATE_UINT32_V(cur_offset, FWCfgState, 2), VMSTATE_END_OF_LIST() } }; -int fw_cfg_add_bytes(void *opaque, uint16_t key, uint8_t *data, uint16_t len) +int fw_cfg_add_bytes(void *opaque, uint16_t key, uint8_t *data, uint32_t len) { FWCfgState *s = opaque; int arch = !!(key & FW_CFG_ARCH_LOCAL); diff --git a/hw/fw_cfg.h b/hw/fw_cfg.h index 30dfec7..359d45a 100644 --- a/hw/fw_cfg.h +++ b/hw/fw_cfg.h @@ -28,7 +28,7 @@ #ifndef NO_QEMU_PROTOS typedef void (*FWCfgCallback)(void *opaque, uint8_t *data); -int fw_cfg_add_bytes(void *opaque, uint16_t key, uint8_t *data, uint16_t len); +int fw_cfg_add_bytes(void *opaque, uint16_t key, uint8_t *data, uint32_t len); int fw_cfg_add_i16(void *opaque, uint16_t key, uint16_t value); int fw_cfg_add_i32(void *opaque, uint16_t key, uint32_t value); int fw_cfg_add_i64(void *opaque, uint16_t key, uint64_t value);