From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47586) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX5BN-0006bj-8p for qemu-devel@nongnu.org; Mon, 07 Apr 2014 04:45:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WX5BH-0001LP-1t for qemu-devel@nongnu.org; Mon, 07 Apr 2014 04:45:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26267) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX5BG-0001LL-Mt for qemu-devel@nongnu.org; Mon, 07 Apr 2014 04:45:26 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s378jP8e024198 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 7 Apr 2014 04:45:25 -0400 Date: Mon, 7 Apr 2014 09:45:21 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20140407084520.GD2400@work-vm> References: <1396840915-10384-1-git-send-email-quintela@redhat.com> <1396840915-10384-97-git-send-email-quintela@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1396840915-10384-97-git-send-email-quintela@redhat.com> Subject: Re: [Qemu-devel] [PATCH 96/97] vmstate: Rename VMS_VBUFFER to VMST_VBUFFER_INT32 for consintency List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org * Juan Quintela (quintela@redhat.com) wrote: > Signed-off-by: Juan Quintela > --- > include/migration/vmstate.h | 6 +++--- > vmstate.c | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h > index 976d83e..145c198 100644 > --- a/include/migration/vmstate.h > +++ b/include/migration/vmstate.h > @@ -96,7 +96,7 @@ enum VMStateFlags { > VMS_BUFFER = 0x020, /* static sized buffer */ > 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_INT32 = 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*/ > @@ -436,7 +436,7 @@ extern const VMStateInfo vmstate_info_bitmap; > .name = (stringify(_field)), \ > .size_offset = vmstate_offset_value(_state, _field_size, int32_t),\ > .info = &vmstate_info_buffer, \ > - .flags = VMS_VBUFFER|VMS_POINTER, \ > + .flags = VMS_VBUFFER_INT32|VMS_POINTER, \ Are there any real users of the code where it's really an INT32 value - can we just not kill off the silly idea of signed buffer sizes altogether? (The only case I can follow through is onenand.c that has a PARTIAL_VBUFFER based on an 'int' called 'blocks', that's derived during init from an unsigned value and passed to things like mallocs and memsets, so it's never going to be negative). Dave > .offset = offsetof(_state, _field), \ > } > > @@ -480,7 +480,7 @@ extern const VMStateInfo vmstate_info_bitmap; > .name = (stringify(_field)), \ > .size_offset = vmstate_offset_value(_state, _field_size, int32_t),\ > .info = &vmstate_info_bitmap, \ > - .flags = VMS_VBUFFER|VMS_POINTER, \ > + .flags = VMS_VBUFFER_INT32|VMS_POINTER, \ > .offset = offsetof(_state, _field), \ > } > > diff --git a/vmstate.c b/vmstate.c > index da5c49d..b1ff280 100644 > --- a/vmstate.c > +++ b/vmstate.c > @@ -33,7 +33,7 @@ static int vmstate_size(void *opaque, VMStateField *field) > { > int size = field->size; > > - if (field->flags & VMS_VBUFFER) { > + if (field->flags & VMS_VBUFFER_INT32) { > size = *(int32_t *)(opaque+field->size_offset); > } else if (field->flags & VMS_VBUFFER_UINT32) { > size = *(uint32_t *)(opaque+field->size_offset); > -- > 1.9.0 > > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK