From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52122) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX0AS-0008VA-6Z for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:24:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WX0AM-0000Ic-0U for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:24:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:20018) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX0AL-0000IU-Ns for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:24:09 -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 s373O9TB006201 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 6 Apr 2014 23:24:09 -0400 From: Juan Quintela Date: Mon, 7 Apr 2014 05:21:53 +0200 Message-Id: <1396840915-10384-96-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 95/97] vmstate: Create VMS_VBUFFER_UINT32 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org We were dereferencing an uint32_t as int32_t. Signed-off-by: Juan Quintela --- include/migration/vmstate.h | 3 ++- vmstate.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 6c503d9..976d83e 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -97,6 +97,7 @@ enum VMStateFlags { VMS_ARRAY_OF_POINTER = 0x040, VMS_VARRAY_UINT16 = 0x080, /* Array with size in uint16_t field */ VMS_VBUFFER = 0x100, /* Buffer with size in int32_t field */ + VMS_VBUFFER_UINT32 = 0x200, /* Buffer with size in uint32_t field */ VMS_VARRAY_UINT8 = 0x400, /* Array with size in uint8_t field*/ VMS_VARRAY_UINT32 = 0x800, /* Array with size in uint32_t field*/ }; @@ -443,7 +444,7 @@ extern const VMStateInfo vmstate_info_bitmap; .name = (stringify(_field)), \ .size_offset = vmstate_offset_value(_state, _field_size, uint32_t),\ .info = &vmstate_info_buffer, \ - .flags = VMS_VBUFFER|VMS_POINTER, \ + .flags = VMS_VBUFFER_UINT32|VMS_POINTER, \ .offset = offsetof(_state, _field), \ } diff --git a/vmstate.c b/vmstate.c index ca6691b..da5c49d 100644 --- a/vmstate.c +++ b/vmstate.c @@ -35,6 +35,8 @@ static int vmstate_size(void *opaque, VMStateField *field) if (field->flags & VMS_VBUFFER) { size = *(int32_t *)(opaque+field->size_offset); + } else if (field->flags & VMS_VBUFFER_UINT32) { + size = *(uint32_t *)(opaque+field->size_offset); } return size; -- 1.9.0