summary refs log tree commit diff stats
path: root/gdbstub.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-10-03 14:07:49 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-10-03 14:07:49 +0100
commitb8e5671a8cd196e7262802ca895bf87d50416989 (patch)
treee4fa16d504ec2bb2249a374c742ee8ccac12111b /gdbstub.c
parentdafd95053611aa14dda40266857608d12ddce658 (diff)
parenta7077b8e354d90fec26c2921aa2dea85b90dff90 (diff)
downloadfocaccia-qemu-b8e5671a8cd196e7262802ca895bf87d50416989.tar.gz
focaccia-qemu-b8e5671a8cd196e7262802ca895bf87d50416989.zip
Merge remote-tracking branch 'remotes/elmarco/tags/chardev-pull-request' into staging
chardev patches

# gpg: Signature made Wed 03 Oct 2018 11:57:34 BST
# gpg:                using RSA key DAE8E10975969CE5
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>"
# gpg:                 aka "Marc-André Lureau <marcandre.lureau@gmail.com>"
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276  F62D DAE8 E109 7596 9CE5

* remotes/elmarco/tags/chardev-pull-request:
  chardev: use a child source for qio input source
  chardev: mark the calls that allow an implicit mux monitor
  char.h: fix gtk-doc comment style
  chardev: unref if underlying chardev has no parent
  chardev: remove qemu_chr_fe_read_all() counter
  chardev: avoid crash if no associated address

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'gdbstub.c')
-rw-r--r--gdbstub.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/gdbstub.c b/gdbstub.c
index d6ab95006c..c8478de8f5 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -2038,7 +2038,11 @@ int gdbserver_start(const char *device)
             sigaction(SIGINT, &act, NULL);
         }
 #endif
-        chr = qemu_chr_new_noreplay("gdb", device);
+        /*
+         * FIXME: it's a bit weird to allow using a mux chardev here
+         * and implicitly setup a monitor. We may want to break this.
+         */
+        chr = qemu_chr_new_noreplay("gdb", device, true);
         if (!chr)
             return -1;
     }