From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45320) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSOn4-0006GN-UO for qemu-devel@nongnu.org; Tue, 25 Mar 2014 06:41:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WSOmv-0008KV-I1 for qemu-devel@nongnu.org; Tue, 25 Mar 2014 06:41:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14423) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSOmv-0008KI-AH for qemu-devel@nongnu.org; Tue, 25 Mar 2014 06:40:57 -0400 Date: Tue, 25 Mar 2014 10:40:44 +0000 From: "Dr. David Alan Gilbert" Message-ID: <20140325104043.GC2459@work-vm> References: <1395698484-22562-1-git-send-email-mst@redhat.com> <1395698484-22562-2-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1395698484-22562-2-git-send-email-mst@redhat.com> Subject: Re: [Qemu-devel] [PATCH RFC v3 1/3] vmstate: add VMS_MUST_EXIST List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: Peter Maydell , qemu-devel@nongnu.org * Michael S. Tsirkin (mst@redhat.com) wrote: > Can be used to verify a required field exists or validate > state in some other way. > > Signed-off-by: Michael S. Tsirkin > --- > include/migration/vmstate.h | 1 + > vmstate.c | 10 ++++++++++ > 2 files changed, 11 insertions(+) > > diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h > index e7e1705..de970ab 100644 > --- a/include/migration/vmstate.h > +++ b/include/migration/vmstate.h > @@ -100,6 +100,7 @@ enum VMStateFlags { > VMS_MULTIPLY = 0x200, /* multiply "size" field by field_size */ > VMS_VARRAY_UINT8 = 0x400, /* Array with size in uint8_t field*/ > VMS_VARRAY_UINT32 = 0x800, /* Array with size in uint32_t field*/ > + VMS_MUST_EXIST = 0x1000, /* Field must exist in input */ > }; > > typedef struct { > diff --git a/vmstate.c b/vmstate.c > index 18b3732..236ce0b 100644 > --- a/vmstate.c > +++ b/vmstate.c > @@ -103,6 +103,10 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd, > return ret; > } > } > + } else if (field->flags & VMS_MUST_EXIST) { > + fprintf(stderr, "Input validation failed: %s/%s\n", > + vmsd->name, field->name); > + return -1; > } > field++; > } > @@ -146,6 +150,12 @@ void vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd, > field->info->put(f, addr, size); > } > } > + } else { > + if (field->flags & VMS_MUST_EXIST) { > + fprintf(stderr, "Output state validation failed: %s/%s\n", > + vmsd->name, field->name); > + assert(!(field->flags & VMS_MUST_EXIST)); > + } > } > field++; > } > -- > MST Reviewed-by: Dr. David Alan Gilbert Dave -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK