From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51808) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX09u-0007kV-96 for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:23:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WX09n-000096-Vf for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:23:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49268) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX09n-00008L-MU for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:23:35 -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 s373NZW0027328 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 6 Apr 2014 23:23:35 -0400 From: Juan Quintela Date: Mon, 7 Apr 2014 05:21:28 +0200 Message-Id: <1396840915-10384-71-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 70/97] vmstate: Remove unused version parameter from VMSTATE_STRUCT_VARRAY_INT32 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Juan Quintela --- hw/input/stellaris_input.c | 2 +- include/migration/vmstate.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/input/stellaris_input.c b/hw/input/stellaris_input.c index 0609e80..07e7856 100644 --- a/hw/input/stellaris_input.c +++ b/hw/input/stellaris_input.c @@ -63,7 +63,7 @@ static const VMStateDescription vmstate_stellaris_gamepad = { .minimum_version_id = 1, .fields = (VMStateField[]) { VMSTATE_INT32(extension, gamepad_state), - VMSTATE_STRUCT_VARRAY_INT32(buttons, gamepad_state, num_buttons, 0, + VMSTATE_STRUCT_VARRAY_INT32(buttons, gamepad_state, num_buttons, vmstate_stellaris_button, gamepad_button), VMSTATE_END_OF_LIST() } diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 02b20b1..1322220 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -360,10 +360,9 @@ extern const VMStateInfo vmstate_info_bitmap; .offset = vmstate_offset_pointer(_state, _field, _type), \ } -#define VMSTATE_STRUCT_VARRAY_INT32(_field, _state, _field_num, _version, _vmsd, _type) { \ +#define VMSTATE_STRUCT_VARRAY_INT32(_field, _state, _field_num, _vmsd, _type) { \ .name = (stringify(_field)), \ .num_offset = vmstate_offset_value(_state, _field_num, int32_t), \ - .version_id = (_version), \ .vmsd = &(_vmsd), \ .size = sizeof(_type), \ .flags = VMS_STRUCT|VMS_VARRAY_INT32, \ -- 1.9.0