From patchwork Mon Apr 21 14:40:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 341138 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 480EC1400DF for ; Tue, 22 Apr 2014 13:21:28 +1000 (EST) Received: from localhost ([::1]:49621 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcG2F-0008L3-PG for incoming@patchwork.ozlabs.org; Mon, 21 Apr 2014 11:21:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59307) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcFRY-0005lS-Ba for qemu-devel@nongnu.org; Mon, 21 Apr 2014 10:43:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WcFRS-0004IA-8T for qemu-devel@nongnu.org; Mon, 21 Apr 2014 10:43:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15481) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcFRR-0004I3-Vq for qemu-devel@nongnu.org; Mon, 21 Apr 2014 10:43:30 -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 s3LEhSI3031315 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 21 Apr 2014 10:43:29 -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 s3LEfi7L019220; Mon, 21 Apr 2014 10:43:27 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 21 Apr 2014 16:40:55 +0200 Message-Id: <1398091304-10677-76-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 075/124] vmstate: Remove unused version parameter from VMSTATE_STRUCT_VARRAY_INT32 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/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 46d46fb..68565ce 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, \