From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46535) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WGlJV-0005Dx-Tl for qemu-devel@nongnu.org; Fri, 21 Feb 2014 03:18:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WGlJN-0001Y5-H5 for qemu-devel@nongnu.org; Fri, 21 Feb 2014 03:18:29 -0500 Received: from e7.ny.us.ibm.com ([32.97.182.137]:44976) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WGlJN-0001Xp-Dl for qemu-devel@nongnu.org; Fri, 21 Feb 2014 03:18:21 -0500 Received: from /spool/local by e7.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 21 Feb 2014 03:18:21 -0500 From: Michael Roth Date: Fri, 21 Feb 2014 02:16:55 -0600 Message-Id: <1392970647-21528-20-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1392970647-21528-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1392970647-21528-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 19/51] vl: add missing transition debug->finish_migrate List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lersek@redhat.com, qemu-stable@nongnu.org, Petar.Jovanovic@imgtec.com From: Paolo Bonzini This fixes an abort if you invoke the "migrate" command while the guest is being debugged. Cc: qemu-stable@nongnu.org Cc: lcapitulino@redhat.com Signed-off-by: Paolo Bonzini Signed-off-by: Luiz Capitulino (cherry picked from commit eca01d3a93be4041ac5858ef7676e60352e9c2ed) Signed-off-by: Michael Roth --- vl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/vl.c b/vl.c index 8d5d874..31e3411 100644 --- a/vl.c +++ b/vl.c @@ -589,6 +589,7 @@ typedef struct { static const RunStateTransition runstate_transitions_def[] = { /* from -> to */ { RUN_STATE_DEBUG, RUN_STATE_RUNNING }, + { RUN_STATE_DEBUG, RUN_STATE_FINISH_MIGRATE }, { RUN_STATE_INMIGRATE, RUN_STATE_RUNNING }, { RUN_STATE_INMIGRATE, RUN_STATE_PAUSED }, -- 1.7.9.5