Commit 62cf396b authored by Markus Armbruster's avatar Markus Armbruster
Browse files

sockets: Rename SocketAddressFlat to SocketAddress 



Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <1493192202-3184-6-git-send-email-armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarPrasanna Kumar Kalever <prasanna.kalever@redhat.com>
parent dfd100f2

block/gluster.c

+24 −24
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ static int parse_volume_options(BlockdevOptionsGluster *gconf, char *path) 
static int qemu_gluster_parse_uri(BlockdevOptionsGluster *gconf,

                                  const char *filename)

{

    SocketAddressFlat *gsconf;

    SocketAddress *gsconf;

    URI *uri;

    QueryParams *qp = NULL;

    bool is_unix = false;
@@ -332,19 +332,19 @@ static int qemu_gluster_parse_uri(BlockdevOptionsGluster *gconf, 
        return -EINVAL;

    }



    gconf->server = g_new0(SocketAddressFlatList, 1);

    gconf->server->value = gsconf = g_new0(SocketAddressFlat, 1);

    gconf->server = g_new0(SocketAddressList, 1);

    gconf->server->value = gsconf = g_new0(SocketAddress, 1);



    /* transport */

    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")) {

        gsconf->type = SOCKET_ADDRESS_FLAT_TYPE_INET;

        gsconf->type = SOCKET_ADDRESS_TYPE_INET;

    } else if (!strcmp(uri->scheme, "gluster+unix")) {

        gsconf->type = SOCKET_ADDRESS_FLAT_TYPE_UNIX;

        gsconf->type = SOCKET_ADDRESS_TYPE_UNIX;

        is_unix = true;

    } 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 "

                     "back to tcp");

    } else {
@@ -396,7 +396,7 @@ static struct glfs *qemu_gluster_glfs_init(BlockdevOptionsGluster *gconf, 
    struct glfs *glfs;

    int ret;

    int old_errno;

    SocketAddressFlatList *server;

    SocketAddressList *server;

    unsigned long long port;



    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) {

        switch (server->value->type) {

        case SOCKET_ADDRESS_FLAT_TYPE_UNIX:

        case SOCKET_ADDRESS_TYPE_UNIX:

            ret = glfs_set_volfile_server(glfs, "unix",

                                   server->value->u.q_unix.path, 0);

            break;

        case SOCKET_ADDRESS_FLAT_TYPE_INET:

        case SOCKET_ADDRESS_TYPE_INET:

            if (parse_uint_full(server->value->u.inet.port, &port, 10) < 0 ||

                port > 65535) {

                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,

                                   (int)port);

            break;

        case SOCKET_ADDRESS_FLAT_TYPE_VSOCK:

        case SOCKET_ADDRESS_FLAT_TYPE_FD:

        case SOCKET_ADDRESS_TYPE_VSOCK:

        case SOCKET_ADDRESS_TYPE_FD:

        default:

            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"

                         " to connect", gconf->volume, gconf->path);

        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 ",

                                  server->value->u.q_unix.path);

            } else {
@@ -487,8 +487,8 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf, 
                                  QDict *options, Error **errp)

{

    QemuOpts *opts;

    SocketAddressFlat *gsconf = NULL;

    SocketAddressFlatList *curr = NULL;

    SocketAddress *gsconf = NULL;

    SocketAddressList *curr = NULL;

    QDict *backing_options = NULL;

    Error *local_err = NULL;

    char *str = NULL;
@@ -542,14 +542,14 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf, 
            goto out;



        }

        gsconf = g_new0(SocketAddressFlat, 1);

        gsconf = g_new0(SocketAddress, 1);

        if (!strcmp(ptr, "tcp")) {

            ptr = "inet";       /* accept legacy "tcp" */

        }

        type = qapi_enum_parse(SocketAddressFlatType_lookup, ptr,

                               SOCKET_ADDRESS_FLAT_TYPE__MAX, -1, NULL);

        if (type != SOCKET_ADDRESS_FLAT_TYPE_INET

            && type != SOCKET_ADDRESS_FLAT_TYPE_UNIX) {

        type = qapi_enum_parse(SocketAddressType_lookup, ptr,

                               SOCKET_ADDRESS_TYPE__MAX, -1, NULL);

        if (type != SOCKET_ADDRESS_TYPE_INET

            && type != SOCKET_ADDRESS_TYPE_UNIX) {

            error_setg(&local_err,

                       "Parameter '%s' may be 'inet' or 'unix'",

                       GLUSTER_OPT_TYPE);
@@ -559,7 +559,7 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf, 
        gsconf->type = type;

        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 */

            opts = qemu_opts_create(&runtime_inet_opts, NULL, 0, &error_abort);

            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) {

            gconf->server = g_new0(SocketAddressFlatList, 1);

            gconf->server = g_new0(SocketAddressList, 1);

            gconf->server->value = gsconf;

            curr = gconf->server;

        } else {

            curr->next = g_new0(SocketAddressFlatList, 1);

            curr->next = g_new0(SocketAddressList, 1);

            curr->next->value = gsconf;

            curr = curr->next;

        }
@@ -648,7 +648,7 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf, 


out:

    error_propagate(errp, local_err);

    qapi_free_SocketAddressFlat(gsconf);

    qapi_free_SocketAddress(gsconf);

    qemu_opts_del(opts);

    g_free(str);

    QDECREF(backing_options);

block/nbd.c

+13 −13
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ typedef struct BDRVNBDState { 
    NBDClientSession client;



    /* For nbd_refresh_filename() */

    SocketAddressFlat *saddr;

    SocketAddress *saddr;

    char *export, *tlscredsid;

} BDRVNBDState;
@@ -258,10 +258,10 @@ static bool nbd_process_legacy_socket_options(QDict *output_options, 
    return true;

}



static SocketAddressFlat *nbd_config(BDRVNBDState *s, QDict *options,

static SocketAddress *nbd_config(BDRVNBDState *s, QDict *options,

                                 Error **errp)

{

    SocketAddressFlat *saddr = NULL;

    SocketAddress *saddr = NULL;

    QDict *addr = NULL;

    QObject *crumpled_addr = NULL;

    Visitor *iv = NULL;
@@ -287,7 +287,7 @@ static SocketAddressFlat *nbd_config(BDRVNBDState *s, QDict *options, 
     * visitor expects the former.

     */

    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) {

        error_propagate(errp, local_err);

        goto done;
@@ -306,7 +306,7 @@ NBDClientSession *nbd_get_client_session(BlockDriverState *bs) 
    return &s->client;

}



static QIOChannelSocket *nbd_establish_connection(SocketAddressFlat *saddr_flat,

static QIOChannelSocket *nbd_establish_connection(SocketAddress *saddr_flat,

                                                  Error **errp)

{

    SocketAddressLegacy *saddr = socket_address_crumple(saddr_flat);
@@ -412,7 +412,7 @@ static int nbd_open(BlockDriverState *bs, QDict *options, int flags, 
        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)) {

        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 */

        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");

            goto error;

        }
@@ -460,7 +460,7 @@ static int nbd_open(BlockDriverState *bs, QDict *options, int flags, 
        object_unref(OBJECT(tlscreds));

    }

    if (ret < 0) {

        qapi_free_SocketAddressFlat(s->saddr);

        qapi_free_SocketAddress(s->saddr);

        g_free(s->export);

        g_free(s->tlscredsid);

    }
@@ -486,7 +486,7 @@ static void nbd_close(BlockDriverState *bs) 


    nbd_client_close(bs);



    qapi_free_SocketAddressFlat(s->saddr);

    qapi_free_SocketAddress(s->saddr);

    g_free(s->export);

    g_free(s->tlscredsid);

}
@@ -517,13 +517,13 @@ static void nbd_refresh_filename(BlockDriverState *bs, QDict *options) 
    Visitor *ov;

    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;

        if (!inet->has_ipv4 && !inet->has_ipv6 && !inet->has_to) {

            host = inet->host;

            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;

    } /* 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);

    visit_type_SocketAddressFlat(ov, NULL, &s->saddr, &error_abort);

    visit_type_SocketAddress(ov, NULL, &s->saddr, &error_abort);

    visit_complete(ov, &saddr_qdict);

    visit_free(ov);

    qdict_put_obj(opts, "server", saddr_qdict);

block/sheepdog.c

+3 −3
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ static SocketAddressLegacy *sd_server_config(QDict *options, Error **errp) 
    QDict *server = NULL;

    QObject *crumpled_server = NULL;

    Visitor *iv = NULL;

    SocketAddressFlat *saddr_flat = NULL;

    SocketAddress *saddr_flat = NULL;

    SocketAddressLegacy *saddr = NULL;

    Error *local_err = NULL;
@@ -574,7 +574,7 @@ static SocketAddressLegacy *sd_server_config(QDict *options, Error **errp) 
     * visitor expects the former.

     */

    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) {

        error_propagate(errp, local_err);

        goto done;
@@ -583,7 +583,7 @@ static SocketAddressLegacy *sd_server_config(QDict *options, Error **errp) 
    saddr = socket_address_crumple(saddr_flat);



done:

    qapi_free_SocketAddressFlat(saddr_flat);

    qapi_free_SocketAddress(saddr_flat);

    visit_free(iv);

    qobject_decref(crumpled_server);

    QDECREF(server);

include/qemu/sockets.h

+2 −2
Original line number Diff line number Diff line
@@ -124,11 +124,11 @@ char *socket_address_to_string(struct SocketAddressLegacy *addr, Error **errp); 
 * socket_address_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().

 *

 * Returns: the argument converted to SocketAddressLegacy.

 */

SocketAddressLegacy *socket_address_crumple(SocketAddressFlat *addr_flat);

SocketAddressLegacy *socket_address_crumple(SocketAddress *addr);



#endif /* QEMU_SOCKETS_H */

qapi-schema.json

+7 −7
Original line number Diff line number Diff line
@@ -4126,7 +4126,7 @@ 
#

# 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

##
@@ -4138,9 +4138,9 @@ 
    'fd': 'String' } }



##

# @SocketAddressFlatType:

# @SocketAddressType:

#

# Available SocketAddressFlat types

# Available SocketAddress types

#

# @inet:  Internet address

#
@@ -4148,11 +4148,11 @@ 
#

# Since: 2.9

##

{ 'enum': 'SocketAddressFlatType',

{ 'enum': 'SocketAddressType',

  'data': [ 'inet', 'unix', 'vsock', 'fd' ] }



##

# @SocketAddressFlat:

# @SocketAddress:

#

# Captures the address of a socket

#
@@ -4164,8 +4164,8 @@ 
#

# Since: 2.9

##

{ 'union': 'SocketAddressFlat',

  'base': { 'type': 'SocketAddressFlatType' },

{ 'union': 'SocketAddress',

  'base': { 'type': 'SocketAddressType' },

  'discriminator': 'type',

  'data': { 'inet': 'InetSocketAddress',

            'unix': 'UnixSocketAddress',