ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sockets: Rename SocketAddressFlat to SocketAddress 

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1493192202-3184-6-git-send-email-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
This commit is contained in:
Markus Armbruster 2017-04-26 09:36:40 +02:00
parent dfd100f242
commit 62cf396b5d
7 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
block/gluster.c
View File

@ -321,7 +321,7 @@ static int parse_volume_options(BlockdevOptionsGluster *gconf, char *path)
static int qemu_gluster_parse_uri(BlockdevOptionsGluster *gconf, static int qemu_gluster_parse_uri(BlockdevOptionsGluster *gconf,
const char *filename) const char *filename)
{ {
SocketAddressFlat *gsconf; SocketAddress *gsconf;
URI *uri; URI *uri;
QueryParams *qp = NULL; QueryParams *qp = NULL;
bool is_unix = false; bool is_unix = false;
@ -332,19 +332,19 @@ static int qemu_gluster_parse_uri(BlockdevOptionsGluster *gconf,
return -EINVAL; return -EINVAL;
} }
gconf->server = g_new0(SocketAddressFlatList, 1); gconf->server = g_new0(SocketAddressList, 1);
gconf->server->value = gsconf = g_new0(SocketAddressFlat, 1); gconf->server->value = gsconf = g_new0(SocketAddress, 1);
/* transport */ /* transport */
if (!uri->scheme || !strcmp(uri->scheme, "gluster")) { if (!uri->scheme || !strcmp(uri->scheme, "gluster")) {
gsconf->type = SOCKET_ADDRESS_FLAT_TYPE_INET; gsconf->type = SOCKET_ADDRESS_TYPE_INET;
} else if (!strcmp(uri->scheme, "gluster+tcp")) { } else if (!strcmp(uri->scheme, "gluster+tcp")) {
gsconf->type = SOCKET_ADDRESS_FLAT_TYPE_INET; gsconf->type = SOCKET_ADDRESS_TYPE_INET;
} else if (!strcmp(uri->scheme, "gluster+unix")) { } else if (!strcmp(uri->scheme, "gluster+unix")) {
gsconf->type = SOCKET_ADDRESS_FLAT_TYPE_UNIX; gsconf->type = SOCKET_ADDRESS_TYPE_UNIX;
is_unix = true; is_unix = true;
} else if (!strcmp(uri->scheme, "gluster+rdma")) { } else if (!strcmp(uri->scheme, "gluster+rdma")) {
gsconf->type = SOCKET_ADDRESS_FLAT_TYPE_INET; gsconf->type = SOCKET_ADDRESS_TYPE_INET;
error_report("Warning: rdma feature is not supported, falling " error_report("Warning: rdma feature is not supported, falling "
"back to tcp"); "back to tcp");
} else { } else {
@ -396,7 +396,7 @@ static struct glfs *qemu_gluster_glfs_init(BlockdevOptionsGluster *gconf,
struct glfs *glfs; struct glfs *glfs;
int ret; int ret;
int old_errno; int old_errno;
SocketAddressFlatList *server; SocketAddressList *server;
unsigned long long port; unsigned long long port;
glfs = glfs_find_preopened(gconf->volume); glfs = glfs_find_preopened(gconf->volume);
@ -413,11 +413,11 @@ static struct glfs *qemu_gluster_glfs_init(BlockdevOptionsGluster *gconf,
for (server = gconf->server; server; server = server->next) { for (server = gconf->server; server; server = server->next) {
switch (server->value->type) { switch (server->value->type) {
case SOCKET_ADDRESS_FLAT_TYPE_UNIX: case SOCKET_ADDRESS_TYPE_UNIX:
ret = glfs_set_volfile_server(glfs, "unix", ret = glfs_set_volfile_server(glfs, "unix",
server->value->u.q_unix.path, 0); server->value->u.q_unix.path, 0);
break; break;
case SOCKET_ADDRESS_FLAT_TYPE_INET: case SOCKET_ADDRESS_TYPE_INET:
if (parse_uint_full(server->value->u.inet.port, &port, 10) < 0 || if (parse_uint_full(server->value->u.inet.port, &port, 10) < 0 ||
port > 65535) { port > 65535) {
error_setg(errp, "'%s' is not a valid port number", error_setg(errp, "'%s' is not a valid port number",
@ -429,8 +429,8 @@ static struct glfs *qemu_gluster_glfs_init(BlockdevOptionsGluster *gconf,
server->value->u.inet.host, server->value->u.inet.host,
(int)port); (int)port);
break; break;
case SOCKET_ADDRESS_FLAT_TYPE_VSOCK: case SOCKET_ADDRESS_TYPE_VSOCK:
case SOCKET_ADDRESS_FLAT_TYPE_FD: case SOCKET_ADDRESS_TYPE_FD:
default: default:
abort(); abort();
} }
@ -450,7 +450,7 @@ static struct glfs *qemu_gluster_glfs_init(BlockdevOptionsGluster *gconf,
error_setg(errp, "Gluster connection for volume %s, path %s failed" error_setg(errp, "Gluster connection for volume %s, path %s failed"
" to connect", gconf->volume, gconf->path); " to connect", gconf->volume, gconf->path);
for (server = gconf->server; server; server = server->next) { for (server = gconf->server; server; server = server->next) {
if (server->value->type == SOCKET_ADDRESS_FLAT_TYPE_UNIX) { if (server->value->type == SOCKET_ADDRESS_TYPE_UNIX) {
error_append_hint(errp, "hint: failed on socket %s ", error_append_hint(errp, "hint: failed on socket %s ",
server->value->u.q_unix.path); server->value->u.q_unix.path);
} else { } else {
@ -487,8 +487,8 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf,
QDict *options, Error **errp) QDict *options, Error **errp)
{ {
QemuOpts *opts; QemuOpts *opts;
SocketAddressFlat *gsconf = NULL; SocketAddress *gsconf = NULL;
SocketAddressFlatList *curr = NULL; SocketAddressList *curr = NULL;
QDict *backing_options = NULL; QDict *backing_options = NULL;
Error *local_err = NULL; Error *local_err = NULL;
char *str = NULL; char *str = NULL;
@ -542,14 +542,14 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf,
goto out; goto out;
} }
gsconf = g_new0(SocketAddressFlat, 1); gsconf = g_new0(SocketAddress, 1);
if (!strcmp(ptr, "tcp")) { if (!strcmp(ptr, "tcp")) {
ptr = "inet"; /* accept legacy "tcp" */ ptr = "inet"; /* accept legacy "tcp" */
} }
type = qapi_enum_parse(SocketAddressFlatType_lookup, ptr, type = qapi_enum_parse(SocketAddressType_lookup, ptr,
SOCKET_ADDRESS_FLAT_TYPE__MAX, -1, NULL); SOCKET_ADDRESS_TYPE__MAX, -1, NULL);
if (type != SOCKET_ADDRESS_FLAT_TYPE_INET if (type != SOCKET_ADDRESS_TYPE_INET
&& type != SOCKET_ADDRESS_FLAT_TYPE_UNIX) { && type != SOCKET_ADDRESS_TYPE_UNIX) {
error_setg(&local_err, error_setg(&local_err,
"Parameter '%s' may be 'inet' or 'unix'", "Parameter '%s' may be 'inet' or 'unix'",
GLUSTER_OPT_TYPE); GLUSTER_OPT_TYPE);
@ -559,7 +559,7 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf,
gsconf->type = type; gsconf->type = type;
qemu_opts_del(opts); qemu_opts_del(opts);
if (gsconf->type == SOCKET_ADDRESS_FLAT_TYPE_INET) { if (gsconf->type == SOCKET_ADDRESS_TYPE_INET) {
/* create opts info from runtime_inet_opts list */ /* create opts info from runtime_inet_opts list */
opts = qemu_opts_create(&runtime_inet_opts, NULL, 0, &error_abort); opts = qemu_opts_create(&runtime_inet_opts, NULL, 0, &error_abort);
qemu_opts_absorb_qdict(opts, backing_options, &local_err); qemu_opts_absorb_qdict(opts, backing_options, &local_err);
@ -628,11 +628,11 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf,
} }
if (gconf->server == NULL) { if (gconf->server == NULL) {
gconf->server = g_new0(SocketAddressFlatList, 1); gconf->server = g_new0(SocketAddressList, 1);
gconf->server->value = gsconf; gconf->server->value = gsconf;
curr = gconf->server; curr = gconf->server;
} else { } else {
curr->next = g_new0(SocketAddressFlatList, 1); curr->next = g_new0(SocketAddressList, 1);
curr->next->value = gsconf; curr->next->value = gsconf;
curr = curr->next; curr = curr->next;
} }
@ -648,7 +648,7 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf,
out: out:
error_propagate(errp, local_err); error_propagate(errp, local_err);
qapi_free_SocketAddressFlat(gsconf); qapi_free_SocketAddress(gsconf);
qemu_opts_del(opts); qemu_opts_del(opts);
g_free(str); g_free(str);
QDECREF(backing_options); QDECREF(backing_options);

24
block/nbd.c
View File

@ -47,7 +47,7 @@ typedef struct BDRVNBDState {
NBDClientSession client; NBDClientSession client;
/* For nbd_refresh_filename() */ /* For nbd_refresh_filename() */
SocketAddressFlat *saddr; SocketAddress *saddr;
char *export, *tlscredsid; char *export, *tlscredsid;
} BDRVNBDState; } BDRVNBDState;
@ -258,10 +258,10 @@ static bool nbd_process_legacy_socket_options(QDict *output_options,
return true; return true;
} }
static SocketAddressFlat *nbd_config(BDRVNBDState *s, QDict *options, static SocketAddress *nbd_config(BDRVNBDState *s, QDict *options,
Error **errp) Error **errp)
{ {
SocketAddressFlat *saddr = NULL; SocketAddress *saddr = NULL;
QDict *addr = NULL; QDict *addr = NULL;
QObject *crumpled_addr = NULL; QObject *crumpled_addr = NULL;
Visitor *iv = NULL; Visitor *iv = NULL;
@ -287,7 +287,7 @@ static SocketAddressFlat *nbd_config(BDRVNBDState *s, QDict *options,
* visitor expects the former. * visitor expects the former.
*/ */
iv = qobject_input_visitor_new(crumpled_addr); iv = qobject_input_visitor_new(crumpled_addr);
visit_type_SocketAddressFlat(iv, NULL, &saddr, &local_err); visit_type_SocketAddress(iv, NULL, &saddr, &local_err);
if (local_err) { if (local_err) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
goto done; goto done;
@ -306,7 +306,7 @@ NBDClientSession *nbd_get_client_session(BlockDriverState *bs)
return &s->client; return &s->client;
} }
static QIOChannelSocket *nbd_establish_connection(SocketAddressFlat *saddr_flat, static QIOChannelSocket *nbd_establish_connection(SocketAddress *saddr_flat,
Error **errp) Error **errp)
{ {
SocketAddressLegacy *saddr = socket_address_crumple(saddr_flat); SocketAddressLegacy *saddr = socket_address_crumple(saddr_flat);
@ -412,7 +412,7 @@ static int nbd_open(BlockDriverState *bs, QDict *options, int flags,
goto error; goto error;
} }
/* Translate @host, @port, and @path to a SocketAddressFlat */ /* Translate @host, @port, and @path to a SocketAddress */
if (!nbd_process_legacy_socket_options(options, opts, errp)) { if (!nbd_process_legacy_socket_options(options, opts, errp)) {
goto error; goto error;
} }
@ -433,7 +433,7 @@ static int nbd_open(BlockDriverState *bs, QDict *options, int flags,
} }
/* TODO SOCKET_ADDRESS_KIND_FD where fd has AF_INET or AF_INET6 */ /* TODO SOCKET_ADDRESS_KIND_FD where fd has AF_INET or AF_INET6 */
if (s->saddr->type != SOCKET_ADDRESS_FLAT_TYPE_INET) { if (s->saddr->type != SOCKET_ADDRESS_TYPE_INET) {
error_setg(errp, "TLS only supported over IP sockets"); error_setg(errp, "TLS only supported over IP sockets");
goto error; goto error;
} }
@ -460,7 +460,7 @@ static int nbd_open(BlockDriverState *bs, QDict *options, int flags,
object_unref(OBJECT(tlscreds)); object_unref(OBJECT(tlscreds));
} }
if (ret < 0) { if (ret < 0) {
qapi_free_SocketAddressFlat(s->saddr); qapi_free_SocketAddress(s->saddr);
g_free(s->export); g_free(s->export);
g_free(s->tlscredsid); g_free(s->tlscredsid);
} }
@ -486,7 +486,7 @@ static void nbd_close(BlockDriverState *bs)
nbd_client_close(bs); nbd_client_close(bs);
qapi_free_SocketAddressFlat(s->saddr); qapi_free_SocketAddress(s->saddr);
g_free(s->export); g_free(s->export);
g_free(s->tlscredsid); g_free(s->tlscredsid);
} }
@ -517,13 +517,13 @@ static void nbd_refresh_filename(BlockDriverState *bs, QDict *options)
Visitor *ov; Visitor *ov;
const char *host = NULL, *port = NULL, *path = NULL; const char *host = NULL, *port = NULL, *path = NULL;
if (s->saddr->type == SOCKET_ADDRESS_FLAT_TYPE_INET) { if (s->saddr->type == SOCKET_ADDRESS_TYPE_INET) {
const InetSocketAddress *inet = &s->saddr->u.inet; const InetSocketAddress *inet = &s->saddr->u.inet;
if (!inet->has_ipv4 && !inet->has_ipv6 && !inet->has_to) { if (!inet->has_ipv4 && !inet->has_ipv6 && !inet->has_to) {
host = inet->host; host = inet->host;
port = inet->port; port = inet->port;
} }
} else if (s->saddr->type == SOCKET_ADDRESS_FLAT_TYPE_UNIX) { } else if (s->saddr->type == SOCKET_ADDRESS_TYPE_UNIX) {
path = s->saddr->u.q_unix.path; path = s->saddr->u.q_unix.path;
} /* else can't represent as pseudo-filename */ } /* else can't represent as pseudo-filename */
@ -544,7 +544,7 @@ static void nbd_refresh_filename(BlockDriverState *bs, QDict *options)
} }
ov = qobject_output_visitor_new(&saddr_qdict); ov = qobject_output_visitor_new(&saddr_qdict);
visit_type_SocketAddressFlat(ov, NULL, &s->saddr, &error_abort); visit_type_SocketAddress(ov, NULL, &s->saddr, &error_abort);
visit_complete(ov, &saddr_qdict); visit_complete(ov, &saddr_qdict);
visit_free(ov); visit_free(ov);
qdict_put_obj(opts, "server", saddr_qdict); qdict_put_obj(opts, "server", saddr_qdict);

6
block/sheepdog.c
View File

@ -554,7 +554,7 @@ static SocketAddressLegacy *sd_server_config(QDict *options, Error **errp)
QDict *server = NULL; QDict *server = NULL;
QObject *crumpled_server = NULL; QObject *crumpled_server = NULL;
Visitor *iv = NULL; Visitor *iv = NULL;
SocketAddressFlat *saddr_flat = NULL; SocketAddress *saddr_flat = NULL;
SocketAddressLegacy *saddr = NULL; SocketAddressLegacy *saddr = NULL;
Error *local_err = NULL; Error *local_err = NULL;
@ -574,7 +574,7 @@ static SocketAddressLegacy *sd_server_config(QDict *options, Error **errp)
* visitor expects the former. * visitor expects the former.
*/ */
iv = qobject_input_visitor_new(crumpled_server); iv = qobject_input_visitor_new(crumpled_server);
visit_type_SocketAddressFlat(iv, NULL, &saddr_flat, &local_err); visit_type_SocketAddress(iv, NULL, &saddr_flat, &local_err);
if (local_err) { if (local_err) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
goto done; goto done;
@ -583,7 +583,7 @@ static SocketAddressLegacy *sd_server_config(QDict *options, Error **errp)
saddr = socket_address_crumple(saddr_flat); saddr = socket_address_crumple(saddr_flat);
done: done:
qapi_free_SocketAddressFlat(saddr_flat); qapi_free_SocketAddress(saddr_flat);
visit_free(iv); visit_free(iv);
qobject_decref(crumpled_server); qobject_decref(crumpled_server);
QDECREF(server); QDECREF(server);

4
include/qemu/sockets.h
View File

@ -124,11 +124,11 @@ char *socket_address_to_string(struct SocketAddressLegacy *addr, Error **errp);
* socket_address_crumple: * socket_address_crumple:
* @addr_flat: the socket address to crumple * @addr_flat: the socket address to crumple
* *
* Convert SocketAddressFlat to SocketAddressLegacy. Caller is responsible * Convert SocketAddress to SocketAddressLegacy. Caller is responsible
* for freeing with qapi_free_SocketAddressLegacy(). * for freeing with qapi_free_SocketAddressLegacy().
* *
* Returns: the argument converted to SocketAddressLegacy. * Returns: the argument converted to SocketAddressLegacy.
*/ */
SocketAddressLegacy *socket_address_crumple(SocketAddressFlat *addr_flat); SocketAddressLegacy *socket_address_crumple(SocketAddress *addr);
#endif /* QEMU_SOCKETS_H */ #endif /* QEMU_SOCKETS_H */

14
qapi-schema.json
View File

@ -4126,7 +4126,7 @@
# #
# Captures the address of a socket, which could also be a named file descriptor # Captures the address of a socket, which could also be a named file descriptor
# #
# Note: This type is deprecated in favor of SocketAddressFlat. # Note: This type is deprecated in favor of SocketAddress.
# #
# Since: 1.3 # Since: 1.3
## ##
@ -4138,9 +4138,9 @@
'fd': 'String' } } 'fd': 'String' } }
## ##
# @SocketAddressFlatType: # @SocketAddressType:
# #
# Available SocketAddressFlat types # Available SocketAddress types
# #
# @inet: Internet address # @inet: Internet address
# #
@ -4148,11 +4148,11 @@
# #
# Since: 2.9 # Since: 2.9
## ##
{ 'enum': 'SocketAddressFlatType', { 'enum': 'SocketAddressType',
'data': [ 'inet', 'unix', 'vsock', 'fd' ] } 'data': [ 'inet', 'unix', 'vsock', 'fd' ] }
## ##
# @SocketAddressFlat: # @SocketAddress:
# #
# Captures the address of a socket # Captures the address of a socket
# #
@ -4164,8 +4164,8 @@
# #
# Since: 2.9 # Since: 2.9
## ##
{ 'union': 'SocketAddressFlat', { 'union': 'SocketAddress',
'base': { 'type': 'SocketAddressFlatType' }, 'base': { 'type': 'SocketAddressType' },
'discriminator': 'type', 'discriminator': 'type',
'data': { 'inet': 'InetSocketAddress', 'data': { 'inet': 'InetSocketAddress',
'unix': 'UnixSocketAddress', 'unix': 'UnixSocketAddress',

6
qapi/block-core.json
View File

@ -2522,7 +2522,7 @@
{ 'struct': 'BlockdevOptionsGluster', { 'struct': 'BlockdevOptionsGluster',
'data': { 'volume': 'str', 'data': { 'volume': 'str',
'path': 'str', 'path': 'str',
'server': ['SocketAddressFlat'], 'server': ['SocketAddress'],
'*debug': 'int', '*debug': 'int',
'*logfile': 'str' } } '*logfile': 'str' } }
@ -2634,7 +2634,7 @@
# Since: 2.9 # Since: 2.9
## ##
{ 'struct': 'BlockdevOptionsSheepdog', { 'struct': 'BlockdevOptionsSheepdog',
'data': { 'server': 'SocketAddressFlat', 'data': { 'server': 'SocketAddress',
'vdi': 'str', 'vdi': 'str',
'*snap-id': 'uint32', '*snap-id': 'uint32',
'*tag': 'str' } } '*tag': 'str' } }
@ -2849,7 +2849,7 @@
# Since: 2.9 # Since: 2.9
## ##
{ 'struct': 'BlockdevOptionsNbd', { 'struct': 'BlockdevOptionsNbd',
'data': { 'server': 'SocketAddressFlat', 'data': { 'server': 'SocketAddress',
'*export': 'str', '*export': 'str',
'*tls-creds': 'str' } } '*tls-creds': 'str' } }

10
util/qemu-sockets.c
View File

@ -1341,27 +1341,27 @@ char *socket_address_to_string(struct SocketAddressLegacy *addr, Error **errp)
return buf; return buf;
} }
SocketAddressLegacy *socket_address_crumple(SocketAddressFlat *addr_flat) SocketAddressLegacy *socket_address_crumple(SocketAddress *addr_flat)
{ {
SocketAddressLegacy *addr = g_new(SocketAddressLegacy, 1); SocketAddressLegacy *addr = g_new(SocketAddressLegacy, 1);
switch (addr_flat->type) { switch (addr_flat->type) {
case SOCKET_ADDRESS_FLAT_TYPE_INET: case SOCKET_ADDRESS_TYPE_INET:
addr->type = SOCKET_ADDRESS_LEGACY_KIND_INET; addr->type = SOCKET_ADDRESS_LEGACY_KIND_INET;
addr->u.inet.data = QAPI_CLONE(InetSocketAddress, addr->u.inet.data = QAPI_CLONE(InetSocketAddress,
&addr_flat->u.inet); &addr_flat->u.inet);
break; break;
case SOCKET_ADDRESS_FLAT_TYPE_UNIX: case SOCKET_ADDRESS_TYPE_UNIX:
addr->type = SOCKET_ADDRESS_LEGACY_KIND_UNIX; addr->type = SOCKET_ADDRESS_LEGACY_KIND_UNIX;
addr->u.q_unix.data = QAPI_CLONE(UnixSocketAddress, addr->u.q_unix.data = QAPI_CLONE(UnixSocketAddress,
&addr_flat->u.q_unix); &addr_flat->u.q_unix);
break; break;
case SOCKET_ADDRESS_FLAT_TYPE_VSOCK: case SOCKET_ADDRESS_TYPE_VSOCK:
addr->type = SOCKET_ADDRESS_LEGACY_KIND_VSOCK; addr->type = SOCKET_ADDRESS_LEGACY_KIND_VSOCK;
addr->u.vsock.data = QAPI_CLONE(VsockSocketAddress, addr->u.vsock.data = QAPI_CLONE(VsockSocketAddress,
&addr_flat->u.vsock); &addr_flat->u.vsock);
break; break;
case SOCKET_ADDRESS_FLAT_TYPE_FD: case SOCKET_ADDRESS_TYPE_FD:
addr->type = SOCKET_ADDRESS_LEGACY_KIND_FD; addr->type = SOCKET_ADDRESS_LEGACY_KIND_FD;
addr->u.fd.data = QAPI_CLONE(String, &addr_flat->u.fd); addr->u.fd.data = QAPI_CLONE(String, &addr_flat->u.fd);
break; break;