chardev: add udp support to qapi
This patch adds 'udp' support to qapi. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
1da48c658a
commit
3ecc059dcd
|
@ -71,6 +71,7 @@ SocketAddress *socket_parse(const char *str, Error **errp);
|
||||||
int socket_connect(SocketAddress *addr, Error **errp,
|
int socket_connect(SocketAddress *addr, Error **errp,
|
||||||
NonBlockingConnectHandler *callback, void *opaque);
|
NonBlockingConnectHandler *callback, void *opaque);
|
||||||
int socket_listen(SocketAddress *addr, Error **errp);
|
int socket_listen(SocketAddress *addr, Error **errp);
|
||||||
|
int socket_dgram(SocketAddress *remote, SocketAddress *local, Error **errp);
|
||||||
|
|
||||||
/* Old, ipv4 only bits. Don't use for new code. */
|
/* Old, ipv4 only bits. Don't use for new code. */
|
||||||
int parse_host_port(struct sockaddr_in *saddr, const char *str);
|
int parse_host_port(struct sockaddr_in *saddr, const char *str);
|
||||||
|
|
|
@ -3166,7 +3166,7 @@
|
||||||
##
|
##
|
||||||
# @ChardevSocket:
|
# @ChardevSocket:
|
||||||
#
|
#
|
||||||
# Configuration info for socket chardevs.
|
# Configuration info for (stream) socket chardevs.
|
||||||
#
|
#
|
||||||
# @addr: socket address to listen on (server=true)
|
# @addr: socket address to listen on (server=true)
|
||||||
# or connect to (server=false)
|
# or connect to (server=false)
|
||||||
|
@ -3184,6 +3184,19 @@
|
||||||
'*nodelay' : 'bool',
|
'*nodelay' : 'bool',
|
||||||
'*telnet' : 'bool' } }
|
'*telnet' : 'bool' } }
|
||||||
|
|
||||||
|
##
|
||||||
|
# @ChardevDgram:
|
||||||
|
#
|
||||||
|
# Configuration info for datagram socket chardevs.
|
||||||
|
#
|
||||||
|
# @remote: remote address
|
||||||
|
# @local: #optional local address
|
||||||
|
#
|
||||||
|
# Since: 1.5
|
||||||
|
##
|
||||||
|
{ 'type': 'ChardevDgram', 'data': { 'remote' : 'SocketAddress',
|
||||||
|
'*local' : 'SocketAddress' } }
|
||||||
|
|
||||||
##
|
##
|
||||||
# @ChardevMux:
|
# @ChardevMux:
|
||||||
#
|
#
|
||||||
|
@ -3272,6 +3285,7 @@
|
||||||
'parallel': 'ChardevHostdev',
|
'parallel': 'ChardevHostdev',
|
||||||
'pipe' : 'ChardevHostdev',
|
'pipe' : 'ChardevHostdev',
|
||||||
'socket' : 'ChardevSocket',
|
'socket' : 'ChardevSocket',
|
||||||
|
'dgram' : 'ChardevDgram',
|
||||||
'pty' : 'ChardevDummy',
|
'pty' : 'ChardevDummy',
|
||||||
'null' : 'ChardevDummy',
|
'null' : 'ChardevDummy',
|
||||||
'mux' : 'ChardevMux',
|
'mux' : 'ChardevMux',
|
||||||
|
|
44
qemu-char.c
44
qemu-char.c
|
@ -2261,21 +2261,14 @@ static void udp_chr_close(CharDriverState *chr)
|
||||||
qemu_chr_be_event(chr, CHR_EVENT_CLOSED);
|
qemu_chr_be_event(chr, CHR_EVENT_CLOSED);
|
||||||
}
|
}
|
||||||
|
|
||||||
static CharDriverState *qemu_chr_open_udp(QemuOpts *opts)
|
static CharDriverState *qemu_chr_open_udp_fd(int fd)
|
||||||
{
|
{
|
||||||
CharDriverState *chr = NULL;
|
CharDriverState *chr = NULL;
|
||||||
NetCharDriver *s = NULL;
|
NetCharDriver *s = NULL;
|
||||||
Error *local_err = NULL;
|
|
||||||
int fd = -1;
|
|
||||||
|
|
||||||
chr = g_malloc0(sizeof(CharDriverState));
|
chr = g_malloc0(sizeof(CharDriverState));
|
||||||
s = g_malloc0(sizeof(NetCharDriver));
|
s = g_malloc0(sizeof(NetCharDriver));
|
||||||
|
|
||||||
fd = inet_dgram_opts(opts, &local_err);
|
|
||||||
if (fd < 0) {
|
|
||||||
goto return_err;
|
|
||||||
}
|
|
||||||
|
|
||||||
s->fd = fd;
|
s->fd = fd;
|
||||||
s->chan = io_channel_from_socket(s->fd);
|
s->chan = io_channel_from_socket(s->fd);
|
||||||
s->bufcnt = 0;
|
s->bufcnt = 0;
|
||||||
|
@ -2285,18 +2278,18 @@ static CharDriverState *qemu_chr_open_udp(QemuOpts *opts)
|
||||||
chr->chr_update_read_handler = udp_chr_update_read_handler;
|
chr->chr_update_read_handler = udp_chr_update_read_handler;
|
||||||
chr->chr_close = udp_chr_close;
|
chr->chr_close = udp_chr_close;
|
||||||
return chr;
|
return chr;
|
||||||
|
}
|
||||||
|
|
||||||
return_err:
|
static CharDriverState *qemu_chr_open_udp(QemuOpts *opts)
|
||||||
if (local_err) {
|
{
|
||||||
qerror_report_err(local_err);
|
Error *local_err = NULL;
|
||||||
error_free(local_err);
|
int fd = -1;
|
||||||
|
|
||||||
|
fd = inet_dgram_opts(opts, &local_err);
|
||||||
|
if (fd < 0) {
|
||||||
|
return NULL;
|
||||||
}
|
}
|
||||||
g_free(chr);
|
return qemu_chr_open_udp_fd(fd);
|
||||||
g_free(s);
|
|
||||||
if (fd >= 0) {
|
|
||||||
closesocket(fd);
|
|
||||||
}
|
|
||||||
return NULL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/***********************************************************/
|
/***********************************************************/
|
||||||
|
@ -3679,6 +3672,18 @@ static CharDriverState *qmp_chardev_open_socket(ChardevSocket *sock,
|
||||||
is_telnet, is_waitconnect, errp);
|
is_telnet, is_waitconnect, errp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static CharDriverState *qmp_chardev_open_dgram(ChardevDgram *dgram,
|
||||||
|
Error **errp)
|
||||||
|
{
|
||||||
|
int fd;
|
||||||
|
|
||||||
|
fd = socket_dgram(dgram->remote, dgram->local, errp);
|
||||||
|
if (error_is_set(errp)) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
return qemu_chr_open_udp_fd(fd);
|
||||||
|
}
|
||||||
|
|
||||||
ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend,
|
ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend,
|
||||||
Error **errp)
|
Error **errp)
|
||||||
{
|
{
|
||||||
|
@ -3708,6 +3713,9 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend,
|
||||||
case CHARDEV_BACKEND_KIND_SOCKET:
|
case CHARDEV_BACKEND_KIND_SOCKET:
|
||||||
chr = qmp_chardev_open_socket(backend->socket, errp);
|
chr = qmp_chardev_open_socket(backend->socket, errp);
|
||||||
break;
|
break;
|
||||||
|
case CHARDEV_BACKEND_KIND_DGRAM:
|
||||||
|
chr = qmp_chardev_open_dgram(backend->dgram, errp);
|
||||||
|
break;
|
||||||
#ifdef HAVE_CHARDEV_TTY
|
#ifdef HAVE_CHARDEV_TTY
|
||||||
case CHARDEV_BACKEND_KIND_PTY:
|
case CHARDEV_BACKEND_KIND_PTY:
|
||||||
chr = qemu_chr_open_pty(id, ret);
|
chr = qemu_chr_open_pty(id, ret);
|
||||||
|
|
|
@ -949,6 +949,31 @@ int socket_listen(SocketAddress *addr, Error **errp)
|
||||||
return fd;
|
return fd;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int socket_dgram(SocketAddress *remote, SocketAddress *local, Error **errp)
|
||||||
|
{
|
||||||
|
QemuOpts *opts;
|
||||||
|
int fd;
|
||||||
|
|
||||||
|
opts = qemu_opts_create_nofail(&dummy_opts);
|
||||||
|
switch (remote->kind) {
|
||||||
|
case SOCKET_ADDRESS_KIND_INET:
|
||||||
|
qemu_opt_set(opts, "host", remote->inet->host);
|
||||||
|
qemu_opt_set(opts, "port", remote->inet->port);
|
||||||
|
if (local) {
|
||||||
|
qemu_opt_set(opts, "localaddr", local->inet->host);
|
||||||
|
qemu_opt_set(opts, "localport", local->inet->port);
|
||||||
|
}
|
||||||
|
fd = inet_dgram_opts(opts, errp);
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
error_setg(errp, "socket type unsupported for datagram");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
qemu_opts_del(opts);
|
||||||
|
return fd;
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
static void socket_cleanup(void)
|
static void socket_cleanup(void)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue