From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48788) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDUOs-0002zx-5Y for qemu-devel@nongnu.org; Wed, 24 May 2017 07:24:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dDUOo-0005S2-U4 for qemu-devel@nongnu.org; Wed, 24 May 2017 07:24:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58126) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dDUOo-0005RI-NS for qemu-devel@nongnu.org; Wed, 24 May 2017 07:24:18 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B32CA72481 for ; Wed, 24 May 2017 11:24:17 +0000 (UTC) Date: Wed, 24 May 2017 19:24:12 +0800 From: Peter Xu Message-ID: <20170524112412.GK3873@pxdev.xzpeter.org> References: <20170524112152.23226-1-quintela@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20170524112152.23226-1-quintela@redhat.com> Subject: Re: [Qemu-devel] [PATCH v2] migration: Allow unregister of save_live handlers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org, dgilbert@redhat.com, lvivier@redhat.com On Wed, May 24, 2017 at 01:21:52PM +0200, Juan Quintela wrote: > Migration non save_live handlers have an ops member that is > dinamically allocated by migration code. Save_live handlers have it > passed as argument and are responsability of the caller. Add a new > member is_allocated that remembers if ops has to be freed. This > allows unregister_savevm() to work with save_live handlers. > > Signed-off-by: Juan Quintela I thought Laurent will prepare one patch that will directly remove existing register_savevm() callers, no? > > --- > > check that se->ops is not NULL (thanks peterx) > --- > include/migration/vmstate.h | 2 ++ > migration/savevm.c | 5 ++++- > 2 files changed, 6 insertions(+), 1 deletion(-) > > diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h > index f97411d..1d20e30 100644 > --- a/include/migration/vmstate.h > +++ b/include/migration/vmstate.h > @@ -57,6 +57,8 @@ typedef struct SaveVMHandlers { > uint64_t *non_postcopiable_pending, > uint64_t *postcopiable_pending); > LoadStateHandler *load_state; > + /* Has been allocated by migratation code */ > + bool is_allocated; > } SaveVMHandlers; > > int register_savevm(DeviceState *dev, > diff --git a/migration/savevm.c b/migration/savevm.c > index d971e5e..569add3 100644 > --- a/migration/savevm.c > +++ b/migration/savevm.c > @@ -628,6 +628,7 @@ int register_savevm(DeviceState *dev, > SaveVMHandlers *ops = g_new0(SaveVMHandlers, 1); > ops->save_state = save_state; > ops->load_state = load_state; > + ops->is_allocated = true; > return register_savevm_live(dev, idstr, instance_id, version_id, > ops, opaque); > } > @@ -651,7 +652,9 @@ void unregister_savevm(DeviceState *dev, const char *idstr, void *opaque) > if (strcmp(se->idstr, id) == 0 && se->opaque == opaque) { > QTAILQ_REMOVE(&savevm_state.handlers, se, entry); > g_free(se->compat); > - g_free(se->ops); > + if (se->ops && se->ops->is_allocated) { > + g_free(se->ops); > + } > g_free(se); > } > } > -- > 2.9.3 > -- Peter Xu