From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marcelo Tosatti <mtosatti@redhat.com>
Subject: [PATCH] savevm: check vmsd for migratability status
Date: Fri, 25 Apr 2014 19:47:09 -0300
Message-ID: <20140425224709.GA27753@amt.cnet>
References: <20140423182002.441209839@amt.cnet>
 <20140423182539.391512909@amt.cnet>
 <20140423190941.GN3363@otherpad.lan.raisama.net>
 <20140423210444.GA4305@amt.cnet>
 <20140424192159.GR3363@otherpad.lan.raisama.net>
 <20140424213242.GA29412@amt.cnet>
 <20140425203808.GW3363@otherpad.lan.raisama.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org,
	Paolo Bonzini <pbonzini@redhat.com>,
	Andreas =?iso-8859-1?Q?F=E4rber?= <afaerber@suse.de>,
	Igor Mammedov <imammedo@redhat.com>
To: Eduardo Habkost <ehabkost@redhat.com>
Return-path: <kvm-owner@vger.kernel.org>
Received: from mx1.redhat.com ([209.132.183.28]:58424 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752004AbaDYWtD (ORCPT <rfc822;kvm@vger.kernel.org>);
	Fri, 25 Apr 2014 18:49:03 -0400
Content-Disposition: inline
In-Reply-To: <20140425203808.GW3363@otherpad.lan.raisama.net>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>


Check vmsd for unmigratable field, allowing migratibility status
to be modified after vmstate_register.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

diff --git a/savevm.c b/savevm.c
index 22123be..61a25c0 100644
--- a/savevm.c
+++ b/savevm.c
@@ -452,7 +452,7 @@ bool qemu_savevm_state_blocked(Error **errp)
     SaveStateEntry *se;
 
     QTAILQ_FOREACH(se, &savevm_handlers, entry) {
-        if (se->no_migrate) {
+        if (se->no_migrate || (se->vmsd && se->vmsd->unmigratable)) {
             error_set(errp, QERR_MIGRATION_NOT_SUPPORTED, se->idstr);
             return true;
         }