From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LxPki-0004c8-FD
	for qemu-devel@nongnu.org; Fri, 24 Apr 2009 14:03:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LxPkh-0004bV-Uy
	for qemu-devel@nongnu.org; Fri, 24 Apr 2009 14:03:55 -0400
Received: from [199.232.76.173] (port=36840 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LxPkh-0004bP-GO
	for qemu-devel@nongnu.org; Fri, 24 Apr 2009 14:03:55 -0400
Received: from savannah.gnu.org ([199.232.41.3]:35170 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <anthony@codemonkey.ws>)
	id 1LxPkh-0003PG-1w
	for qemu-devel@nongnu.org; Fri, 24 Apr 2009 14:03:55 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <anthony@codemonkey.ws>) id 1LxPkg-00033D-Jc
	for qemu-devel@nongnu.org; Fri, 24 Apr 2009 18:03:54 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <aliguori@savannah.gnu.org>) id 1LxPkg-000339-CL
	for qemu-devel@nongnu.org; Fri, 24 Apr 2009 18:03:54 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1LxPkg-000339-CL@cvs.savannah.gnu.org>
Date: Fri, 24 Apr 2009 18:03:54 +0000
Subject: [Qemu-devel] [7245] qemu: use debug_requested global instead of
 cpu_exec return ( Marcelo Tosatti)
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 7245
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7245
Author:   aliguori
Date:     2009-04-24 18:03:54 +0000 (Fri, 24 Apr 2009)
Log Message:
-----------
qemu: use debug_requested global instead of cpu_exec return (Marcelo Tosatti)

Necessary for the next refactoring patch.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/vl.c

Modified: trunk/vl.c
===================================================================
--- trunk/vl.c	2009-04-24 18:03:49 UTC (rev 7244)
+++ trunk/vl.c	2009-04-24 18:03:54 UTC (rev 7245)
@@ -3568,6 +3568,7 @@
 static int reset_requested;
 static int shutdown_requested;
 static int powerdown_requested;
+static int debug_requested;
 
 int qemu_shutdown_requested(void)
 {
@@ -3590,6 +3591,13 @@
     return r;
 }
 
+static int qemu_debug_requested(void)
+{
+    int r = debug_requested;
+    debug_requested = 0;
+    return r;
+}
+
 void qemu_register_reset(QEMUResetHandler *func, void *opaque)
 {
     QEMUResetEntry **pre, *re;
@@ -4019,6 +4027,8 @@
         return 0;
     if (shutdown_requested)
         return 0;
+    if (debug_requested)
+        return 0;
     return 1;
 }
 
@@ -4045,6 +4055,7 @@
                 ret = qemu_cpu_exec(env);
                 if (ret == EXCP_DEBUG) {
                     gdb_set_stop_cpu(env);
+                    debug_requested = 1;
                     break;
                 }
             }
@@ -4055,11 +4066,11 @@
 #ifdef CONFIG_PROFILER
             dev_time += profile_getclock() - ti;
 #endif
-        } while (ret != EXCP_DEBUG && vm_can_run());
+        } while (vm_can_run());
 
-        if (ret == EXCP_DEBUG)
+
+        if (qemu_debug_requested())
             vm_stop(EXCP_DEBUG);
-
         if (qemu_shutdown_requested()) {
             if (no_shutdown) {
                 vm_stop(0);