Merge commit '9605111958173938ac08298f515d55e937d0211c' into upstream-merge

* commit '9605111958173938ac08298f515d55e937d0211c':
  ioapic: convert to qdev
  ioapic: unexport ioapic_set_irq
  Usermode exec-stack fix
  Strace mprotect flags.
  GDB exit status for semihosting
  cris: Move sign extension.
  cris: Centralize fetching
  cris: Make the CRISv32 insn decoders return signed int.
  tcg: Optionally sign-extend 32-bit arguments for 64-bit hosts.
  Fix comparison which always returned false
  xen: Fix build error due to missing include
  block: fix a warning and possible truncation
  Correct definitions for FD_CMD_SAVE and FD_CMD_RESTORE

Conflicts:
	hw/ioapic.c
	hw/pc_piix.c

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 20 insertions, 14 deletions

diff --git a/gdbstub.c b/gdbstub.c
index b964d706b..654633a19 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -2374,6 +2374,26 @@ static void gdb_read_byte(GDBState *s, int ch)
     }
 }
 
+/* Tell the remote gdb that the process has exited.  */
+void gdb_exit(CPUState *env, int code)
+{
+  GDBState *s;
+  char buf[4];
+
+  s = gdbserver_state;
+  if (!s) {
+      return;
+  }
+#ifdef CONFIG_USER_ONLY
+  if (gdbserver_fd < 0 || s->fd < 0) {
+      return;
+  }
+#endif
+
+  snprintf(buf, sizeof(buf), "W%02x", (uint8_t)code);
+  put_packet(s, buf);
+}
+
 #ifdef CONFIG_USER_ONLY
 int
 gdb_queuesig (void)
@@ -2437,20 +2457,6 @@ gdb_handlesig (CPUState *env, int sig)
   return sig;
 }
 
-/* Tell the remote gdb that the process has exited.  */
-void gdb_exit(CPUState *env, int code)
-{
-  GDBState *s;
-  char buf[4];
-
-  s = gdbserver_state;
-  if (gdbserver_fd < 0 || s->fd < 0)
-    return;
-
-  snprintf(buf, sizeof(buf), "W%02x", code);
-  put_packet(s, buf);
-}
-
 /* Tell the remote gdb that the process has exited due to SIG.  */
 void gdb_signalled(CPUState *env, int sig)
 {