[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/7] char-socket: make 'fd' incompatible with 'reconn
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PULL 3/7] char-socket: make 'fd' incompatible with 'reconnect' |
Date: |
Tue, 30 Oct 2018 21:36:23 +0400 |
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 <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
---
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
- [Qemu-devel] [PULL 0/7] Chardev patches, Marc-André Lureau, 2018/10/30
- [Qemu-devel] [PULL 1/7] websock: fix handshake leak, Marc-André Lureau, 2018/10/30
- [Qemu-devel] [PULL 3/7] char-socket: make 'fd' incompatible with 'reconnect',
Marc-André Lureau <=
- [Qemu-devel] [PULL 2/7] char-socket: correctly set has_reconnect when parsing QemuOpts, Marc-André Lureau, 2018/10/30
- [Qemu-devel] [PULL 4/7] chardev/char-socket: Function headers refactoring, Marc-André Lureau, 2018/10/30
- [Qemu-devel] [PULL 6/7] tests/test-char: Check websocket chardev functionality, Marc-André Lureau, 2018/10/30
- [Qemu-devel] [PULL 7/7] editorconfig: set emacs mode, Marc-André Lureau, 2018/10/30
- [Qemu-devel] [PULL 5/7] chardev: Add websocket support, Marc-André Lureau, 2018/10/30
- Re: [Qemu-devel] [PULL 0/7] Chardev patches, Peter Maydell, 2018/10/31