From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51847) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX09y-0007s0-Gq for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:23:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WX09s-0000A0-28 for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:23:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42449) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX09r-00009v-PI for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:23:39 -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 s373Ndhi025906 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 6 Apr 2014 23:23:39 -0400 From: Juan Quintela Date: Mon, 7 Apr 2014 05:21:31 +0200 Message-Id: <1396840915-10384-74-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 73/97] vmstate: Remove version parameter from VMSTATE_VARRAY_UINT32 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Juan Quintela --- hw/nvram/ds1225y.c | 2 +- hw/ppc/spapr_iommu.c | 3 ++- include/migration/vmstate.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/nvram/ds1225y.c b/hw/nvram/ds1225y.c index 332598b..cfedfa8 100644 --- a/hw/nvram/ds1225y.c +++ b/hw/nvram/ds1225y.c @@ -97,7 +97,7 @@ static const VMStateDescription vmstate_nvram = { .minimum_version_id = 0, .post_load = nvram_post_load, .fields = (VMStateField[]) { - VMSTATE_VARRAY_UINT32(contents, NvRamState, chip_size, 0, + VMSTATE_VARRAY_UINT32(contents, NvRamState, chip_size, vmstate_info_uint8, uint8_t), VMSTATE_END_OF_LIST() } diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c index ce15751..9fda2b3 100644 --- a/hw/ppc/spapr_iommu.c +++ b/hw/ppc/spapr_iommu.c @@ -105,7 +105,8 @@ static const VMStateDescription vmstate_spapr_tce_table = { /* IOMMU state */ VMSTATE_BOOL(bypass, sPAPRTCETable), - VMSTATE_VARRAY_UINT32(table, sPAPRTCETable, nb_table, 0, vmstate_info_uint64, uint64_t), + VMSTATE_VARRAY_UINT32(table, sPAPRTCETable, nb_table, + vmstate_info_uint64, uint64_t), VMSTATE_END_OF_LIST() }, diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 2a914ec..7bbac50 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -611,7 +611,7 @@ extern const VMStateInfo vmstate_info_bitmap; #define VMSTATE_UNUSED(_size) \ VMSTATE_UNUSED_TEST(NULL, _size) -#define VMSTATE_VARRAY_UINT32(_field, _state, _field_num, _version, _info, _type) \ +#define VMSTATE_VARRAY_UINT32(_field, _state, _field_num, _info, _type) \ VMSTATE_VARRAY_UINT32_TEST(_field, _state, _field_num, NULL, _info, _type) #define VMSTATE_END_OF_LIST() \ -- 1.9.0