From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51677) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX09f-0007Jv-D4 for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:23:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WX09Z-0008VR-1e for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:23:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:24774) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX09Y-0008VE-Pg for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:23:20 -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 s373NK8l027263 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 6 Apr 2014 23:23:20 -0400 From: Juan Quintela Date: Mon, 7 Apr 2014 05:21:17 +0200 Message-Id: <1396840915-10384-60-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 59/97] vmstate: Remove version_id from VMSTATE_VARRAY_UINT16_UNSAFE List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Juan Quintela --- hw/nvram/eeprom93xx.c | 2 +- include/migration/vmstate.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/nvram/eeprom93xx.c b/hw/nvram/eeprom93xx.c index 7e09037..8f59509 100644 --- a/hw/nvram/eeprom93xx.c +++ b/hw/nvram/eeprom93xx.c @@ -145,7 +145,7 @@ static const VMStateDescription vmstate_eeprom = { VMSTATE_UNUSED_TEST(is_old_eeprom_version, 1), VMSTATE_UINT16_EQUAL_TEST(size, eeprom_t, is_eeprom_version), VMSTATE_UINT16(data, eeprom_t), - VMSTATE_VARRAY_UINT16_UNSAFE(contents, eeprom_t, size, 0, + VMSTATE_VARRAY_UINT16_UNSAFE(contents, eeprom_t, size, vmstate_info_uint16, uint16_t), VMSTATE_END_OF_LIST() } diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 905c19a..5a26b6a 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -268,9 +268,8 @@ extern const VMStateInfo vmstate_info_bitmap; .offset = vmstate_offset_pointer(_state, _field, _type), \ } -#define VMSTATE_VARRAY_UINT16_UNSAFE(_field, _state, _field_num, _version, _info, _type) {\ +#define VMSTATE_VARRAY_UINT16_UNSAFE(_field, _state, _field_num, _info, _type) {\ .name = (stringify(_field)), \ - .version_id = (_version), \ .num_offset = vmstate_offset_value(_state, _field_num, uint16_t),\ .info = &(_info), \ .size = sizeof(_type), \ -- 1.9.0