From patchwork Fri Feb 4 15:47:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 81915 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]) by ozlabs.org (Postfix) with ESMTP id 91CD2B7121 for ; Sat, 5 Feb 2011 03:17:19 +1100 (EST) Received: from localhost ([127.0.0.1]:44179 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PlOG2-0000Bx-I5 for incoming@patchwork.ozlabs.org; Fri, 04 Feb 2011 11:11:38 -0500 Received: from [140.186.70.92] (port=51769 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PlNuw-000637-PA for qemu-devel@nongnu.org; Fri, 04 Feb 2011 10:49:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PlNut-0007zj-VF for qemu-devel@nongnu.org; Fri, 04 Feb 2011 10:49:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:29722) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PlNut-0007z1-OX for qemu-devel@nongnu.org; Fri, 04 Feb 2011 10:49:47 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p14Fnl0B019026 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 4 Feb 2011 10:49:47 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p14FnkgV001047; Fri, 4 Feb 2011 10:49:46 -0500 Received: from amt.cnet (vpn2-8-97.ams2.redhat.com [10.36.8.97]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id p14FnhlA002221; Fri, 4 Feb 2011 10:49:45 -0500 Received: from amt.cnet (localhost.localdomain [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id E0EB2652029; Fri, 4 Feb 2011 13:47:45 -0200 (BRST) Received: (from marcelo@localhost) by amt.cnet (8.14.4/8.14.4/Submit) id p14Flgbw017669; Fri, 4 Feb 2011 13:47:42 -0200 From: Marcelo Tosatti To: Anthony Liguori Date: Fri, 4 Feb 2011 13:47:06 -0200 Message-Id: <00d6e393b0a59b558e86e73625c47610a7382f19.1296834446.git.mtosatti@redhat.com> In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Jan Kiszka , Marcelo Tosatti , qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH 03/23] Process vmstop requests in IO thread 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 From: Jan Kiszka A pending vmstop request is also a reason to leave the inner main loop. So far we ignored it, and pending stop requests issued over VCPU threads were simply ignored. Signed-off-by: Jan Kiszka Signed-off-by: Marcelo Tosatti --- vl.c | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/vl.c b/vl.c index b1dc3ff..57b4c9f 100644 --- a/vl.c +++ b/vl.c @@ -1391,15 +1391,11 @@ void main_loop_wait(int nonblocking) static int vm_can_run(void) { - if (powerdown_requested) - return 0; - if (reset_requested) - return 0; - if (shutdown_requested) - return 0; - if (debug_requested) - return 0; - return 1; + return !(powerdown_requested || + reset_requested || + shutdown_requested || + debug_requested || + vmstop_requested); } qemu_irq qemu_system_powerdown;