From patchwork Sun Aug 9 11:39:20 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 31016 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 6BC51B7080 for ; Sun, 9 Aug 2009 21:40:08 +1000 (EST) Received: from localhost ([127.0.0.1]:54431 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ma6kr-0003zd-AN for incoming@patchwork.ozlabs.org; Sun, 09 Aug 2009 07:40:01 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ma6kO-0003zY-BX for qemu-devel@nongnu.org; Sun, 09 Aug 2009 07:39:32 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Ma6kI-0003zM-I1 for qemu-devel@nongnu.org; Sun, 09 Aug 2009 07:39:30 -0400 Received: from [199.232.76.173] (port=48615 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ma6kI-0003zJ-EY for qemu-devel@nongnu.org; Sun, 09 Aug 2009 07:39:26 -0400 Received: from mx2.redhat.com ([66.187.237.31]:58836) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Ma6kH-0005xO-Uy for qemu-devel@nongnu.org; Sun, 09 Aug 2009 07:39:26 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n79BdNMK008183; Sun, 9 Aug 2009 07:39:23 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n79BdMor006571; Sun, 9 Aug 2009 07:39:22 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n79BdLum019770; Sun, 9 Aug 2009 07:39:21 -0400 Received: from localhost.localdomain (cleopatra.tlv.redhat.com [10.35.255.11]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id C10EF250061; Sun, 9 Aug 2009 14:39:20 +0300 (IDT) From: Avi Kivity To: Anthony Liguori Date: Sun, 9 Aug 2009 14:39:20 +0300 Message-Id: <1249817960-11020-1-git-send-email-avi@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH] Do not disable autostart for live migration 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 If the user does not want autostart, they can specify -S. Signed-off-by: Avi Kivity --- vl.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/vl.c b/vl.c index a526cb0..cf7fb3b 100644 --- a/vl.c +++ b/vl.c @@ -6090,12 +6090,10 @@ int main(int argc, char **argv, char **envp) do_loadvm(cur_mon, loadvm); if (incoming) { - autostart = 0; qemu_start_incoming_migration(incoming); - } - - else if (autostart) + } else if (autostart) { vm_start(); + } #ifndef _WIN32 if (daemonize) {