From patchwork Mon Apr 21 14:40:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 341123 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id EA0901400DF for ; Tue, 22 Apr 2014 13:20:49 +1000 (EST) Received: from localhost ([::1]:49585 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcFyr-0003xq-SW for incoming@patchwork.ozlabs.org; Mon, 21 Apr 2014 11:18:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59137) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcFRM-0005RV-A2 for qemu-devel@nongnu.org; Mon, 21 Apr 2014 10:43:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WcFRF-0004E7-Qb for qemu-devel@nongnu.org; Mon, 21 Apr 2014 10:43:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37706) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcFRF-0004E0-Gz for qemu-devel@nongnu.org; Mon, 21 Apr 2014 10:43:17 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s3LEhGRU002346 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 21 Apr 2014 10:43:16 -0400 Received: from trasno.mitica (ovpn-116-41.ams2.redhat.com [10.36.116.41]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s3LEfi7C019220; Mon, 21 Apr 2014 10:43:15 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 21 Apr 2014 16:40:46 +0200 Message-Id: <1398091304-10677-67-git-send-email-quintela@redhat.com> In-Reply-To: <1398091304-10677-1-git-send-email-quintela@redhat.com> References: <1398091304-10677-1-git-send-email-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 066/124] vmstate: remove version parameter from VMSTATE_BUFFER_POINTER_UNSAFE 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 Signed-off-by: Juan Quintela --- hw/block/onenand.c | 2 +- hw/sd/sd.c | 2 +- include/migration/vmstate.h | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/block/onenand.c b/hw/block/onenand.c index 60d5311..87fbf00 100644 --- a/hw/block/onenand.c +++ b/hw/block/onenand.c @@ -189,7 +189,7 @@ static const VMStateDescription vmstate_onenand = { VMSTATE_UINT8(ecc.cp, OneNANDState), VMSTATE_UINT16_ARRAY(ecc.lp, OneNANDState, 2), VMSTATE_UINT16(ecc.count, OneNANDState), - VMSTATE_BUFFER_POINTER_UNSAFE(otp, OneNANDState, 0, + VMSTATE_BUFFER_POINTER_UNSAFE(otp, OneNANDState, ((64 + 2) << PAGE_SHIFT)), VMSTATE_END_OF_LIST() } diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 7ee8c24..ac909f3 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -480,7 +480,7 @@ static const VMStateDescription sd_vmstate = { VMSTATE_UINT64(data_start, SDState), VMSTATE_UINT32(data_offset, SDState), VMSTATE_UINT8_ARRAY(data, SDState, 512), - VMSTATE_BUFFER_POINTER_UNSAFE(buf, SDState, 1, 512), + VMSTATE_BUFFER_POINTER_UNSAFE(buf, SDState, 512), VMSTATE_BOOL(enable, SDState), VMSTATE_END_OF_LIST() } diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index fcd2c8a..b3db632 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -435,9 +435,8 @@ extern const VMStateInfo vmstate_info_bitmap; .offset = offsetof(_state, _field), \ } -#define VMSTATE_BUFFER_POINTER_UNSAFE(_field, _state, _version, _size) { \ +#define VMSTATE_BUFFER_POINTER_UNSAFE(_field, _state, _size) { \ .name = (stringify(_field)), \ - .version_id = (_version), \ .size = (_size), \ .info = &vmstate_info_buffer, \ .flags = VMS_BUFFER|VMS_POINTER, \