From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50424) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1JLq-0002X6-Oy for qemu-devel@nongnu.org; Tue, 14 Aug 2012 11:48:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1JLo-0002F5-HJ for qemu-devel@nongnu.org; Tue, 14 Aug 2012 11:48:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43935) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1JLo-0002Ev-97 for qemu-devel@nongnu.org; Tue, 14 Aug 2012 11:48:12 -0400 Date: Tue, 14 Aug 2012 12:48:49 -0300 From: Luiz Capitulino Message-ID: <20120814124849.0f747d6f@doriath.home> In-Reply-To: <502A6882.1020508@redhat.com> References: <1344951151-26387-1-git-send-email-aliguori@us.ibm.com> <502A5735.1010409@redhat.com> <20120814115246.0b6ab76a@doriath.home> <502A6882.1020508@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] block-migration: deprecate block migration for the 1.2 release List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf Cc: Paolo Bonzini , Anthony Liguori , qemu-devel@nongnu.org, Stefan Hajnoczi On Tue, 14 Aug 2012 17:02:26 +0200 Kevin Wolf wrote: > Am 14.08.2012 16:52, schrieb Luiz Capitulino: > > On Tue, 14 Aug 2012 15:48:37 +0200 > > Kevin Wolf wrote: > > > >> Am 14.08.2012 15:32, schrieb Anthony Liguori: > >>> To be replaced with live block copy. > >>> > >>> Signed-off-by: Anthony Liguori > >> > >> Might be worth adding a deprecation note in qapi-schema.json. > >> > >>> --- > >>> migration.c | 9 +++++++++ > >>> 1 files changed, 9 insertions(+), 0 deletions(-) > >>> > >>> diff --git a/migration.c b/migration.c > >>> index 653a3c1..babccf4 100644 > >>> --- a/migration.c > >>> +++ b/migration.c > >>> @@ -482,10 +482,19 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, > >>> MigrationParams params; > >>> const char *p; > >>> int ret; > >>> + static bool suppress_deprecation_message; > >>> > >>> params.blk = blk; > >>> params.shared = inc; > >>> > >>> + if (blk && !suppress_deprecation_message) { > >> > >> Hm, it's consistent with when we start block migration, but has_blk is > >> completely ignored for that and blk seems to be uninitialised if > >> !has_blk. I think this needs to be fixed. (Why does qmp-marshal.c even > >> compile when it can use blk uninitialised...?) > > > > Are you referring to qmp_marshal_input_migrate()? Where does it use > > blk uninitialized? > > Yes, I am. Maybe I'm missing the obvious thing, but: > > bool blk; > ... > if (has_blk) { > visit_type_bool(v, &blk, "blk", errp); > } > ... > qmp_migrate(uri, has_blk, blk, has_inc, inc, has_detach, detach, errp); > > If has_blk is false, blk is never assigned a value before the > qmp_migrate() call, which uses it. Yes, qmp_migrate() should only use blk if has_blk is true. The point you made above about this patch is correct. I thought you were talking about other usages.