From patchwork Thu Jan 2 16:17:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 306153 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id DEDFA2C0090 for ; Fri, 3 Jan 2014 03:17:42 +1100 (EST) Received: from localhost ([::1]:45982 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vykxo-0005KC-FM for incoming@patchwork.ozlabs.org; Thu, 02 Jan 2014 11:17:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58030) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VykxS-0005HD-KX for qemu-devel@nongnu.org; Thu, 02 Jan 2014 11:17:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VykxM-0003Sg-Hh for qemu-devel@nongnu.org; Thu, 02 Jan 2014 11:17:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36044) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VykxM-0003QN-9Q; Thu, 02 Jan 2014 11:17:12 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s02GHBll008082 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 2 Jan 2014 11:17:11 -0500 Received: from localhost (ovpn-113-121.phx2.redhat.com [10.3.113.121]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s02GHAnH007353; Thu, 2 Jan 2014 11:17:10 -0500 Date: Thu, 2 Jan 2014 11:17:09 -0500 From: Luiz Capitulino To: qemu-devel Message-ID: <20140102111709.3684c332@redhat.com> Organization: Red Hat Mime-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: quintela@redhat.com, qemu-stable@nongnu.org, mrhines@us.ibm.com Subject: [Qemu-devel] [PATCH] migration: qmp_migrate(): keep working after syntax error 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 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. Signed-off-by: Luiz Capitulino Reviewed-by: Michael R. Hines --- 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; }