From: Blue Swirl <blauwirbel@gmail.com>
Date: Mon, 29 Mar 2010 19:23:46 +0000 (+0000)
Subject: Adjust debug handling
X-Git-Tag: v0.13.0-rc0~933
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54fc6ea92bdd698498706d3cd8e10afd78680bed;p=thirdparty%2Fqemu.git

Adjust debug handling

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---

diff --git a/vl.c b/vl.c
index 8a73235aded..a2869b8dbe6 100644
--- a/vl.c
+++ b/vl.c
@@ -2920,7 +2920,7 @@ static bool tcg_cpu_exec(void)
 
         if (ret == EXCP_DEBUG) {
             gdb_set_stop_cpu(env);
-            debug_requested = 1;
+            debug_requested = EXCP_DEBUG;
             break;
         }
     }
@@ -2983,8 +2983,8 @@ static void main_loop(void)
 #endif
         } while (vm_can_run());
 
-        if (qemu_debug_requested()) {
-            vm_stop(EXCP_DEBUG);
+        if ((r = qemu_debug_requested())) {
+            vm_stop(r);
         }
         if (qemu_shutdown_requested()) {
             monitor_protocol_event(QEVENT_SHUTDOWN, NULL);