openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu-socket: Make socket_optslist public 

Allow other users to create the QemuOpts needed for inet_connect_opts().

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Kevin Wolf 2013-03-15 17:14:24 +01:00
parent 707ff8282b
commit e62be8888a
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/qemu/sockets.h
View File

@ -30,6 +30,8 @@ int inet_aton(const char *cp, struct in_addr *ia);
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp/qerror.h" #include "qapi/qmp/qerror.h"
extern QemuOptsList socket_optslist;
/* misc helpers */ /* misc helpers */
int qemu_socket(int domain, int type, int protocol); int qemu_socket(int domain, int type, int protocol);
int qemu_accept(int s, struct sockaddr *addr, socklen_t *addrlen); int qemu_accept(int s, struct sockaddr *addr, socklen_t *addrlen);

24
util/qemu-sockets.c
View File

@ -33,10 +33,10 @@
static const int on=1, off=0; static const int on=1, off=0;
/* used temporarely until all users are converted to QemuOpts */ /* used temporarily until all users are converted to QemuOpts */
static QemuOptsList dummy_opts = { QemuOptsList socket_optslist = {
.name = "dummy", .name = "socket",
.head = QTAILQ_HEAD_INITIALIZER(dummy_opts.head), .head = QTAILQ_HEAD_INITIALIZER(socket_optslist.head),
.desc = { .desc = {
{ {
.name = "path", .name = "path",
@ -583,7 +583,7 @@ int inet_listen(const char *str, char *ostr, int olen,
addr = inet_parse(str, errp); addr = inet_parse(str, errp);
if (addr != NULL) { if (addr != NULL) {
opts = qemu_opts_create_nofail(&dummy_opts); opts = qemu_opts_create_nofail(&socket_optslist);
inet_addr_to_opts(opts, addr); inet_addr_to_opts(opts, addr);
qapi_free_InetSocketAddress(addr); qapi_free_InetSocketAddress(addr);
sock = inet_listen_opts(opts, port_offset, errp); sock = inet_listen_opts(opts, port_offset, errp);
@ -656,7 +656,7 @@ int inet_nonblocking_connect(const char *str,
addr = inet_parse(str, errp); addr = inet_parse(str, errp);
if (addr != NULL) { if (addr != NULL) {
opts = qemu_opts_create_nofail(&dummy_opts); opts = qemu_opts_create_nofail(&socket_optslist);
inet_addr_to_opts(opts, addr); inet_addr_to_opts(opts, addr);
qapi_free_InetSocketAddress(addr); qapi_free_InetSocketAddress(addr);
sock = inet_connect_opts(opts, errp, callback, opaque); sock = inet_connect_opts(opts, errp, callback, opaque);
@ -799,7 +799,7 @@ int unix_listen(const char *str, char *ostr, int olen, Error **errp)
char *path, *optstr; char *path, *optstr;
int sock, len; int sock, len;
opts = qemu_opts_create_nofail(&dummy_opts); opts = qemu_opts_create_nofail(&socket_optslist);
optstr = strchr(str, ','); optstr = strchr(str, ',');
if (optstr) { if (optstr) {
@ -827,7 +827,7 @@ int unix_connect(const char *path, Error **errp)
QemuOpts *opts; QemuOpts *opts;
int sock; int sock;
opts = qemu_opts_create_nofail(&dummy_opts); opts = qemu_opts_create_nofail(&socket_optslist);
qemu_opt_set(opts, "path", path); qemu_opt_set(opts, "path", path);
sock = unix_connect_opts(opts, errp, NULL, NULL); sock = unix_connect_opts(opts, errp, NULL, NULL);
qemu_opts_del(opts); qemu_opts_del(opts);
@ -844,7 +844,7 @@ int unix_nonblocking_connect(const char *path,
g_assert(callback != NULL); g_assert(callback != NULL);
opts = qemu_opts_create_nofail(&dummy_opts); opts = qemu_opts_create_nofail(&socket_optslist);
qemu_opt_set(opts, "path", path); qemu_opt_set(opts, "path", path);
sock = unix_connect_opts(opts, errp, callback, opaque); sock = unix_connect_opts(opts, errp, callback, opaque);
qemu_opts_del(opts); qemu_opts_del(opts);
@ -895,7 +895,7 @@ int socket_connect(SocketAddress *addr, Error **errp,
QemuOpts *opts; QemuOpts *opts;
int fd; int fd;
opts = qemu_opts_create_nofail(&dummy_opts); opts = qemu_opts_create_nofail(&socket_optslist);
switch (addr->kind) { switch (addr->kind) {
case SOCKET_ADDRESS_KIND_INET: case SOCKET_ADDRESS_KIND_INET:
inet_addr_to_opts(opts, addr->inet); inet_addr_to_opts(opts, addr->inet);
@ -926,7 +926,7 @@ int socket_listen(SocketAddress *addr, Error **errp)
QemuOpts *opts; QemuOpts *opts;
int fd; int fd;
opts = qemu_opts_create_nofail(&dummy_opts); opts = qemu_opts_create_nofail(&socket_optslist);
switch (addr->kind) { switch (addr->kind) {
case SOCKET_ADDRESS_KIND_INET: case SOCKET_ADDRESS_KIND_INET:
inet_addr_to_opts(opts, addr->inet); inet_addr_to_opts(opts, addr->inet);
@ -954,7 +954,7 @@ int socket_dgram(SocketAddress *remote, SocketAddress *local, Error **errp)
QemuOpts *opts; QemuOpts *opts;
int fd; int fd;
opts = qemu_opts_create_nofail(&dummy_opts); opts = qemu_opts_create_nofail(&socket_optslist);
switch (remote->kind) { switch (remote->kind) {
case SOCKET_ADDRESS_KIND_INET: case SOCKET_ADDRESS_KIND_INET:
qemu_opt_set(opts, "host", remote->inet->host); qemu_opt_set(opts, "host", remote->inet->host);