diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-10-03 14:07:49 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-10-03 14:07:49 +0100 |
| commit | b8e5671a8cd196e7262802ca895bf87d50416989 (patch) | |
| tree | e4fa16d504ec2bb2249a374c742ee8ccac12111b /net | |
| parent | dafd95053611aa14dda40266857608d12ddce658 (diff) | |
| parent | a7077b8e354d90fec26c2921aa2dea85b90dff90 (diff) | |
| download | qemu-b8e5671a8cd196e7262802ca895bf87d50416989.zip qemu-b8e5671a8cd196e7262802ca895bf87d50416989.tar.gz qemu-b8e5671a8cd196e7262802ca895bf87d50416989.tar.bz2 | |
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 'net')
| -rw-r--r-- | net/slirp.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/slirp.c b/net/slirp.c index c93b64d..99884de 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -764,7 +764,11 @@ static int slirp_guestfwd(SlirpState *s, const char *config_str, Error **errp) } } else { Error *err = NULL; - Chardev *chr = qemu_chr_new(buf, p); + /* + * FIXME: sure we want to support implicit + * muxed monitors here? + */ + Chardev *chr = qemu_chr_new_mux_mon(buf, p); if (!chr) { error_setg(errp, "Could not open guest forwarding device '%s'", |