From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51807) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0IGp-00005y-WC for qemu-devel@nongnu.org; Mon, 06 Jan 2014 17:03:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0IGk-00013G-1K for qemu-devel@nongnu.org; Mon, 06 Jan 2014 17:03:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:21406) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0IGj-00012s-OZ for qemu-devel@nongnu.org; Mon, 06 Jan 2014 17:03:33 -0500 From: Luiz Capitulino Date: Mon, 6 Jan 2014 17:03:15 -0500 Message-Id: <1389045795-18706-15-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1389045795-18706-1-git-send-email-lcapitulino@redhat.com> References: <1389045795-18706-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PULL 14/14] migration: qmp_migrate(): keep working after syntax error List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: qemu-devel@nongnu.org If a user or QMP client enter a bad syntax for the migrate command in QMP/HMP, then the migrate command will never succeed from that point on. For example, if you enter: (qemu) migrate tcp;0:4444 migrate: Parameter 'uri' expects a valid migration protocol Then the migrate command will always fail from now on: (qemu) migrate tcp:0:4444 migrate: There's a migration process in progress The problem is that qmp_migrate() sets the migration status to MIG_STATE_SETUP and doesn't reset it on syntax error. This bug was introduced by commit 29ae8a4133082e16970c9d4be09f4b6a15034617. Reviewed-by: Michael R. Hines Signed-off-by: Luiz Capitulino --- migration.c | 1 + 1 file changed, 1 insertion(+) diff --git a/migration.c b/migration.c index 2b1ab20..557195a 100644 --- a/migration.c +++ b/migration.c @@ -437,6 +437,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, #endif } else { error_set(errp, QERR_INVALID_PARAMETER_VALUE, "uri", "a valid migration protocol"); + s->state = MIG_STATE_ERROR; return; } -- 1.8.1.4