From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58105) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cbsGw-00019V-6L for qemu-devel@nongnu.org; Thu, 09 Feb 2017 12:12:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cbsGr-0003Ha-1d for qemu-devel@nongnu.org; Thu, 09 Feb 2017 12:12:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33006) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cbsGq-0003HT-SI for qemu-devel@nongnu.org; Thu, 09 Feb 2017 12:12:36 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 97325C158432 for ; Thu, 9 Feb 2017 17:12:36 +0000 (UTC) From: Juan Quintela In-Reply-To: <20170124103329.GA2220@work-vm> (David Alan Gilbert's message of "Tue, 24 Jan 2017 10:33:29 +0000") References: <1485207141-1941-1-git-send-email-quintela@redhat.com> <1485207141-1941-4-git-send-email-quintela@redhat.com> <20170124103329.GA2220@work-vm> Reply-To: quintela@redhat.com Date: Thu, 09 Feb 2017 18:12:33 +0100 Message-ID: <87zihvnv9a.fsf@emacs.mitica> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH 03/17] migration: Test for disabled features on reception List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Dr. David Alan Gilbert" Cc: qemu-devel@nongnu.org, amit.shah@redhat.com "Dr. David Alan Gilbert" wrote: > * Juan Quintela (quintela@redhat.com) wrote: >> Right now, if we receive a compressed page or a xbzrle page while this >> features are disabled, Bad Things (TM) can happen. Just add a test for >> them. >> >> Signed-off-by: Juan Quintela >> --- >> migration/ram.c | 23 ++++++++++++++++++++++- >> 1 file changed, 22 insertions(+), 1 deletion(-) >> >> diff --git a/migration/ram.c b/migration/ram.c >> index ef8fadf..4ad814a 100644 >> --- a/migration/ram.c >> +++ b/migration/ram.c >> @@ -2455,7 +2455,7 @@ static int ram_load_postcopy(QEMUFile *f) >> >> static int ram_load(QEMUFile *f, void *opaque, int version_id) >> { >> - int flags = 0, ret = 0; >> + int flags = 0, ret = 0, invalid_flags; >> static uint64_t seq_iter; >> int len = 0; >> /* >> @@ -2470,6 +2470,15 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) >> ret = -EINVAL; >> } >> >> + invalid_flags = 0; >> + >> + if (!migrate_use_xbzrle()) { >> + invalid_flags |= RAM_SAVE_FLAG_XBZRLE; >> + } > > Is that really the case? I thought we used to ignore the flags on the incoming > side and didn't need to enable xbzrle on the destination? we don't need infrastructure for xbzrle, but we need it for compression. Removing xbzrle.