From patchwork Wed Apr 30 16:48:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 344226 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 479A41400A8 for ; Thu, 1 May 2014 02:58:42 +1000 (EST) Received: from localhost ([::1]:57979 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WfXqC-0003rK-85 for incoming@patchwork.ozlabs.org; Wed, 30 Apr 2014 12:58:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53444) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WfXmu-00061k-GY for qemu-devel@nongnu.org; Wed, 30 Apr 2014 12:55:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WfXmo-00052g-BY for qemu-devel@nongnu.org; Wed, 30 Apr 2014 12:55:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18433) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WfXmo-00052b-3F for qemu-devel@nongnu.org; Wed, 30 Apr 2014 12:55:10 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s3UGnaFa025329 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 30 Apr 2014 12:49:36 -0400 Received: from localhost (ovpn-113-106.phx2.redhat.com [10.3.113.106]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s3UGnYgA007082; Wed, 30 Apr 2014 12:49:35 -0400 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Wed, 30 Apr 2014 13:48:43 -0300 Message-Id: <1398876525-28831-17-git-send-email-ehabkost@redhat.com> In-Reply-To: <1398876525-28831-1-git-send-email-ehabkost@redhat.com> References: <1398876525-28831-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Juan Quintela , Marcelo Tosatti , Paolo Bonzini , Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno , Richard Henderson Subject: [Qemu-devel] [PATCH v4 16/18] savevm: check vmsd for migratability status X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Marcelo Tosatti Check vmsd for unmigratable field, allowing migratibility status to be modified after vmstate_register. Cc: Juan Quintela Signed-off-by: Marcelo Tosatti Reviewed-by: Eduardo Habkost Signed-off-by: Eduardo Habkost --- savevm.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/savevm.c b/savevm.c index da8aa24..c578e42 100644 --- a/savevm.c +++ b/savevm.c @@ -232,7 +232,6 @@ typedef struct SaveStateEntry { const VMStateDescription *vmsd; void *opaque; CompatEntry *compat; - int no_migrate; int is_ram; } SaveStateEntry; @@ -292,7 +291,6 @@ int register_savevm_live(DeviceState *dev, se->ops = ops; se->opaque = opaque; se->vmsd = NULL; - se->no_migrate = 0; /* if this is a live_savem then set is_ram */ if (ops->save_live_setup != NULL) { se->is_ram = 1; @@ -383,7 +381,6 @@ int vmstate_register_with_alias_id(DeviceState *dev, int instance_id, se->opaque = opaque; se->vmsd = vmsd; se->alias_id = alias_id; - se->no_migrate = vmsd->unmigratable; if (dev) { char *id = qdev_get_dev_path(dev); @@ -452,7 +449,7 @@ bool qemu_savevm_state_blocked(Error **errp) SaveStateEntry *se; QTAILQ_FOREACH(se, &savevm_handlers, entry) { - if (se->no_migrate) { + if (se->vmsd && se->vmsd->unmigratable) { error_setg(errp, "State blocked by non-migratable device '%s'", se->idstr); return true;