From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51702) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX09h-0007Ol-Uw for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:23:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WX09b-0008WJ-P5 for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:23:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:4832) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX09b-0008W1-GC for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:23:23 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s373NMIu006008 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 6 Apr 2014 23:23:23 -0400 From: Juan Quintela Date: Mon, 7 Apr 2014 05:21:19 +0200 Message-Id: <1396840915-10384-62-git-send-email-quintela@redhat.com> In-Reply-To: <1396840915-10384-1-git-send-email-quintela@redhat.com> References: <1396840915-10384-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PATCH 61/97] vmstate: remove version parameter from VMSTATE_BUFFER_POINTER_UNSAFE List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@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 6d064de..a114d30 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, \ -- 1.9.0