From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51749) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX09n-0007YP-Aq for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:23:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WX09h-000060-5L for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:23:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10257) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX09g-00005n-Sq for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:23:29 -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 s373NS3R025852 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 6 Apr 2014 23:23:28 -0400 From: Juan Quintela Date: Mon, 7 Apr 2014 05:21:23 +0200 Message-Id: <1396840915-10384-66-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 65/97] vmstate: Remove version parameter from VMSTATE_STATIC_BUFFER List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org No user for it. Signed-off-by: Juan Quintela --- include/migration/vmstate.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index b9d5a28..95e4e17 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -381,9 +381,8 @@ extern const VMStateInfo vmstate_info_bitmap; .offset = offsetof(_state, _field), \ } -#define VMSTATE_STATIC_BUFFER(_field, _state, _version, _test, _start, _size) { \ +#define VMSTATE_STATIC_BUFFER(_field, _state, _test, _start, _size) { \ .name = (stringify(_field)), \ - .version_id = (_version), \ .field_exists = (_test), \ .size = (_size - _start), \ .info = &vmstate_info_buffer, \ @@ -591,13 +590,13 @@ extern const VMStateInfo vmstate_info_bitmap; VMSTATE_SUB_ARRAY(_f, _s, _start, _num, vmstate_info_uint32, uint32_t) #define VMSTATE_BUFFER(_f, _s) \ - VMSTATE_STATIC_BUFFER(_f, _s, 0, NULL, 0, sizeof(typeof_field(_s, _f))) + VMSTATE_STATIC_BUFFER(_f, _s, NULL, 0, sizeof(typeof_field(_s, _f))) #define VMSTATE_PARTIAL_BUFFER(_f, _s, _size) \ - VMSTATE_STATIC_BUFFER(_f, _s, 0, NULL, 0, _size) + VMSTATE_STATIC_BUFFER(_f, _s, NULL, 0, _size) #define VMSTATE_BUFFER_START_MIDDLE(_f, _s, _start) \ - VMSTATE_STATIC_BUFFER(_f, _s, 0, NULL, _start, sizeof(typeof_field(_s, _f))) + VMSTATE_STATIC_BUFFER(_f, _s, NULL, _start, sizeof(typeof_field(_s, _f))) #define VMSTATE_PARTIAL_VBUFFER(_f, _s, _size) \ VMSTATE_VBUFFER(_f, _s, NULL, 0, _size) @@ -609,7 +608,7 @@ extern const VMStateInfo vmstate_info_bitmap; VMSTATE_VBUFFER(_f, _s, NULL, _start, _size) #define VMSTATE_BUFFER_TEST(_f, _s, _test) \ - VMSTATE_STATIC_BUFFER(_f, _s, 0, _test, 0, sizeof(typeof_field(_s, _f))) + VMSTATE_STATIC_BUFFER(_f, _s, _test, 0, sizeof(typeof_field(_s, _f))) #define VMSTATE_BUFFER_UNSAFE(_field, _state, _size) \ VMSTATE_BUFFER_UNSAFE_TEST(_field, _state, NULL, vmstate_info_buffer, _size) -- 1.9.0