mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chardev: teach socket to accept no addresses

Browse Source 
The following patches are going to use CharSocket as a base class for
sockets that are created with a given fd (without a given address).

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Marc-André Lureau 2021-07-25 23:59:12 +04:00
parent ff1a5810f6
commit 1b87751fb1
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
chardev/char-socket.c
View File

@ -1248,6 +1248,10 @@ static int qmp_chardev_open_socket_server(Chardev *chr,
qio_net_listener_set_name(s->listener, name); qio_net_listener_set_name(s->listener, name);
g_free(name); g_free(name);
if (s->addr->type == SOCKET_ADDRESS_TYPE_FD && !*s->addr->u.fd.str) {
goto skip_listen;
}
if (qio_net_listener_open_sync(s->listener, s->addr, 1, errp) < 0) { if (qio_net_listener_open_sync(s->listener, s->addr, 1, errp) < 0) {
object_unref(OBJECT(s->listener)); object_unref(OBJECT(s->listener));
s->listener = NULL; s->listener = NULL;
@ -1256,6 +1260,8 @@ static int qmp_chardev_open_socket_server(Chardev *chr,
qapi_free_SocketAddress(s->addr); qapi_free_SocketAddress(s->addr);
s->addr = socket_local_address(s->listener->sioc[0]->fd, errp); s->addr = socket_local_address(s->listener->sioc[0]->fd, errp);
skip_listen:
update_disconnected_filename(s); update_disconnected_filename(s);
if (is_waitconnect) { if (is_waitconnect) {
@ -1466,9 +1472,9 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend,
SocketAddressLegacy *addr; SocketAddressLegacy *addr;
ChardevSocket *sock; ChardevSocket *sock;
if ((!!path + !!fd + !!host) != 1) { if ((!!path + !!fd + !!host) > 1) {
error_setg(errp, error_setg(errp,
"Exactly one of 'path', 'fd' or 'host' required"); "None or one of 'path', 'fd' or 'host' option required.");
return; return;
} }
@ -1542,12 +1548,10 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend,
.has_ipv6 = qemu_opt_get(opts, "ipv6"), .has_ipv6 = qemu_opt_get(opts, "ipv6"),
.ipv6 = qemu_opt_get_bool(opts, "ipv6", 0), .ipv6 = qemu_opt_get_bool(opts, "ipv6", 0),
}; };
} else if (fd) { } else {
addr->type = SOCKET_ADDRESS_TYPE_FD; addr->type = SOCKET_ADDRESS_TYPE_FD;
addr->u.fd.data = g_new(String, 1); addr->u.fd.data = g_new(String, 1);
addr->u.fd.data->str = g_strdup(fd); addr->u.fd.data->str = g_strdup(fd);
} else {
g_assert_not_reached();
} }
sock->addr = addr; sock->addr = addr;
} }