From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53210) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WW0qL-0007lS-FZ for qemu-devel@nongnu.org; Fri, 04 Apr 2014 05:55:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WW0qF-0003pk-BM for qemu-devel@nongnu.org; Fri, 04 Apr 2014 05:55:25 -0400 Date: Fri, 4 Apr 2014 10:54:59 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20140404095458.GA2457@work-vm> References: <1396543778-22307-1-git-send-email-mst@redhat.com> <1396543778-22307-3-git-send-email-mst@redhat.com> <87txa98m9b.fsf@elfo.mitica> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87txa98m9b.fsf@elfo.mitica> Subject: Re: [Qemu-devel] [PATCH v5 02/24] vmstate: add VMS_MUST_EXIST List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: Peter Maydell , qemu-devel@nongnu.org, Fam Zheng , "Michael S. Tsirkin" , Igor Mitsyanko , mdroth@linux.vnet.ibm.com, qemu-stable@nongnu.org, Amit Shah * Juan Quintela (quintela@redhat.com) wrote: > "Michael S. Tsirkin" wrote: > > Can be used to verify a required field exists or validate > > state in some other way. > > > > Signed-off-by: Michael S. Tsirkin > > Reviewed-by: Dr. David Alan Gilbert > > > What should this do? > > We can change the semantics of ->field_exist() to add this functionality > if needed, no? Well that's what Michael is doing; he's changing the use of ->field_exist() here, so that if this flag is set then a failure of field_exist causes a migration failure. Dave > > > --- > > 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 dd6f834..f019228 100644 > > --- a/vmstate.c > > +++ b/vmstate.c > > @@ -102,6 +102,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++; > > } > > @@ -142,6 +146,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++; > > } -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK