From patchwork Fri Jan 7 22:13:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 77922 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E0E67B715A for ; Sat, 8 Jan 2011 09:14:05 +1100 (EST) Received: from localhost ([127.0.0.1]:41189 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PbKZO-000241-4f for incoming@patchwork.ozlabs.org; Fri, 07 Jan 2011 17:14:02 -0500 Received: from [140.186.70.92] (port=38883 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PbKYr-00023m-HJ for qemu-devel@nongnu.org; Fri, 07 Jan 2011 17:13:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PbKYq-0005Y1-CH for qemu-devel@nongnu.org; Fri, 07 Jan 2011 17:13:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36230) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PbKYq-0005Xx-4V for qemu-devel@nongnu.org; Fri, 07 Jan 2011 17:13:28 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id p07MDQ1Q031079 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 7 Jan 2011 17:13:26 -0500 Received: from s20.home (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p07MDPhH017653; Fri, 7 Jan 2011 17:13:25 -0500 From: Alex Williamson To: qemu-devel@nongnu.org Date: Fri, 07 Jan 2011 15:13:25 -0700 Message-ID: <20110107220801.15395.38757.stgit@s20.home> In-Reply-To: <20110107183518.13483.52633.stgit@s20.home> References: <20110107183518.13483.52633.stgit@s20.home> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: alex.williamson@redhat.com, mst@redhat.com, jan.kiszka@web.de, quintela@redhat.com Subject: [Qemu-devel] [PATCH v4] savevm: Fix no_migrate X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The no_migrate save state flag is currently only checked in the last phase of migration. This means that we potentially waste a lot of time and bandwidth with the live state handlers before we ever check the no_migrate flags. The error message printed when we catch a non-migratable device doesn't get printed for a detached migration. And, no_migrate does nothing to prevent an incoming migration to a target that includes a non-migratable device. This attempts to fix all of these. One notable difference in behavior is that an outgoing migration now checks for non-migratable devices before ever connecting to the target system. This means the target will remain listening rather than exit from failure. Signed-off-by: Alex Williamson --- v4: - fix braces noted by Jan - return error from qemu_savevm_state_blocked rather than fixed EINVAL at qemu_loadvm_state(), since it'a already using errno values v3: Daniel, adding you to see if libvirt cares about the difference in whether the target exits on migration failure as noted above. Also adding Michael as he's complained about the no_migrate check happening so late in the process. migration.c | 4 ++++ savevm.c | 41 +++++++++++++++++++++++++++-------------- sysemu.h | 1 + 3 files changed, 32 insertions(+), 14 deletions(-) diff --git a/migration.c b/migration.c index e5ba51c..d593b1d 100644 --- a/migration.c +++ b/migration.c @@ -88,6 +88,10 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data) return -1; } + if (qemu_savevm_state_blocked(mon)) { + return -1; + } + if (strstart(uri, "tcp:", &p)) { s = tcp_start_outgoing_migration(mon, p, max_throttle, detach, blk, inc); diff --git a/savevm.c b/savevm.c index 90aa237..34c0d1a 100644 --- a/savevm.c +++ b/savevm.c @@ -1401,19 +1401,13 @@ static int vmstate_load(QEMUFile *f, SaveStateEntry *se, int version_id) return vmstate_load_state(f, se->vmsd, se->opaque, version_id); } -static int vmstate_save(QEMUFile *f, SaveStateEntry *se) +static void vmstate_save(QEMUFile *f, SaveStateEntry *se) { - if (se->no_migrate) { - return -1; - } - if (!se->vmsd) { /* Old style */ se->save_state(f, se->opaque); - return 0; + return; } vmstate_save_state(f,se->vmsd, se->opaque); - - return 0; } #define QEMU_VM_FILE_MAGIC 0x5145564d @@ -1427,6 +1421,20 @@ static int vmstate_save(QEMUFile *f, SaveStateEntry *se) #define QEMU_VM_SECTION_FULL 0x04 #define QEMU_VM_SUBSECTION 0x05 +int qemu_savevm_state_blocked(Monitor *mon) +{ + SaveStateEntry *se; + + QTAILQ_FOREACH(se, &savevm_handlers, entry) { + if (se->no_migrate) { + monitor_printf(mon, "state blocked by non-migratable device '%s'\n", + se->idstr); + return -EINVAL; + } + } + return 0; +} + int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, int blk_enable, int shared) { @@ -1508,7 +1516,6 @@ int qemu_savevm_state_iterate(Monitor *mon, QEMUFile *f) int qemu_savevm_state_complete(Monitor *mon, QEMUFile *f) { SaveStateEntry *se; - int r; cpu_synchronize_all_states(); @@ -1541,11 +1548,7 @@ int qemu_savevm_state_complete(Monitor *mon, QEMUFile *f) qemu_put_be32(f, se->instance_id); qemu_put_be32(f, se->version_id); - r = vmstate_save(f, se); - if (r < 0) { - monitor_printf(mon, "cannot migrate with device '%s'\n", se->idstr); - return r; - } + vmstate_save(f, se); } qemu_put_byte(f, QEMU_VM_EOF); @@ -1575,6 +1578,11 @@ static int qemu_savevm_state(Monitor *mon, QEMUFile *f) saved_vm_running = vm_running; vm_stop(0); + ret = qemu_savevm_state_blocked(mon); + if (ret < 0) { + goto out; + } + ret = qemu_savevm_state_begin(mon, f, 0, 0); if (ret < 0) goto out; @@ -1692,6 +1700,11 @@ int qemu_loadvm_state(QEMUFile *f) unsigned int v; int ret; + ret = qemu_savevm_state_blocked(default_mon); + if (ret < 0) { + return ret; + } + v = qemu_get_be32(f); if (v != QEMU_VM_FILE_MAGIC) return -EINVAL; diff --git a/sysemu.h b/sysemu.h index e728ea1..eefaba5 100644 --- a/sysemu.h +++ b/sysemu.h @@ -75,6 +75,7 @@ void qemu_announce_self(void); void main_loop_wait(int nonblocking); +int qemu_savevm_state_blocked(Monitor *mon); int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, int blk_enable, int shared); int qemu_savevm_state_iterate(Monitor *mon, QEMUFile *f);