From: "Marc-André Lureau" <marcandre.lureau@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Daniel P . Berrangé" <berrange@redhat.com>
Subject: [Qemu-devel] [PULL 3/7] char-socket: make 'fd' incompatible with 'reconnect'
Date: Tue, 30 Oct 2018 21:36:23 +0400 [thread overview]
Message-ID: <20181030173627.7711-4-marcandre.lureau@redhat.com> (raw)
In-Reply-To: <20181030173627.7711-1-marcandre.lureau@redhat.com>
A chardev socket created with the 'fd=' argument is not going to
handle reconnection properly by recycling the same fd (or not in a
supported way). Let's forbid this case.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---
chardev/char-socket.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index 64e24cb2ab..e4137ccd3c 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -997,6 +997,10 @@ static void qmp_chardev_open_socket(Chardev *chr,
s->addr = addr = socket_address_flatten(sock->addr);
+ if (sock->has_reconnect && addr->type == SOCKET_ADDRESS_TYPE_FD) {
+ error_setg(errp, "'reconnect' option is incompatible with 'fd'");
+ goto error;
+ }
qemu_chr_set_feature(chr, QEMU_CHAR_FEATURE_RECONNECTABLE);
/* TODO SOCKET_ADDRESS_FD where fd has AF_UNIX */
if (addr->type == SOCKET_ADDRESS_TYPE_UNIX) {
--
2.19.1.708.g4ede3d42df
next prev parent reply other threads:[~2018-10-30 17:37 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-30 17:36 [Qemu-devel] [PULL 0/7] Chardev patches Marc-André Lureau
2018-10-30 17:36 ` [Qemu-devel] [PULL 1/7] websock: fix handshake leak Marc-André Lureau
2018-10-30 17:36 ` [Qemu-devel] [PULL 2/7] char-socket: correctly set has_reconnect when parsing QemuOpts Marc-André Lureau
2018-10-30 17:36 ` Marc-André Lureau [this message]
2018-10-30 17:36 ` [Qemu-devel] [PULL 4/7] chardev/char-socket: Function headers refactoring Marc-André Lureau
2018-10-30 17:36 ` [Qemu-devel] [PULL 5/7] chardev: Add websocket support Marc-André Lureau
2018-10-30 17:36 ` [Qemu-devel] [PULL 6/7] tests/test-char: Check websocket chardev functionality Marc-André Lureau
2018-10-30 17:36 ` [Qemu-devel] [PULL 7/7] editorconfig: set emacs mode Marc-André Lureau
2018-10-31 16:11 ` [Qemu-devel] [PULL 0/7] Chardev patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181030173627.7711-4-marcandre.lureau@redhat.com \
--to=marcandre.lureau@redhat.com \
--cc=berrange@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).