[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v17 1/4] block/gluster: rename [server, volname,
From: |
Jeff Cody |
Subject: |
Re: [Qemu-devel] [PATCH v17 1/4] block/gluster: rename [server, volname, image] -> [host, volume, path] |
Date: |
Fri, 17 Jun 2016 13:32:02 -0400 |
User-agent: |
Mutt/1.5.24 (2015-08-30) |
On Wed, Jun 15, 2016 at 01:55:44PM +0530, Prasanna Kumar Kalever wrote:
> A future patch will add support for multiple gluster servers. Existing
> terminology is a bit unusual in relation to what names are used by
> other networked devices, and doesn't map very well to the terminology
> we expect to use for multiple servers. Therefore, rename the following
> options:
> 'server' -> 'host'
> 'image' -> 'path'
> 'volname' -> 'volume'
>
> Signed-off-by: Prasanna Kumar Kalever <address@hidden>
> Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
> ---
> block/gluster.c | 54 +++++++++++++++++++++++++++---------------------------
> 1 file changed, 27 insertions(+), 27 deletions(-)
>
> diff --git a/block/gluster.c b/block/gluster.c
> index d361d8e..0c711a3 100644
> --- a/block/gluster.c
> +++ b/block/gluster.c
> @@ -27,19 +27,19 @@ typedef struct BDRVGlusterState {
> } BDRVGlusterState;
>
> typedef struct GlusterConf {
> - char *server;
> + char *host;
> int port;
> - char *volname;
> - char *image;
> + char *volume;
> + char *path;
> char *transport;
> } GlusterConf;
>
> static void qemu_gluster_gconf_free(GlusterConf *gconf)
> {
> if (gconf) {
> - g_free(gconf->server);
> - g_free(gconf->volname);
> - g_free(gconf->image);
> + g_free(gconf->host);
> + g_free(gconf->volume);
> + g_free(gconf->path);
> g_free(gconf->transport);
> g_free(gconf);
> }
> @@ -59,19 +59,19 @@ static int parse_volume_options(GlusterConf *gconf, char
> *path)
> if (*p == '\0') {
> return -EINVAL;
> }
> - gconf->volname = g_strndup(q, p - q);
> + gconf->volume = g_strndup(q, p - q);
>
> - /* image */
> + /* path */
> p += strspn(p, "/");
> if (*p == '\0') {
> return -EINVAL;
> }
> - gconf->image = g_strdup(p);
> + gconf->path = g_strdup(p);
> return 0;
> }
>
> /*
> - * file=gluster[+transport]://[server[:port]]/volname/image[?socket=...]
> + * file=gluster[+transport]://[host[:port]]/volume/path[?socket=...]
> *
> * 'gluster' is the protocol.
> *
> @@ -80,10 +80,10 @@ static int parse_volume_options(GlusterConf *gconf, char
> *path)
> * tcp, unix and rdma. If a transport type isn't specified, then tcp
> * type is assumed.
> *
> - * 'server' specifies the server where the volume file specification for
> + * 'host' specifies the host where the volume file specification for
> * the given volume resides. This can be either hostname, ipv4 address
> * or ipv6 address. ipv6 address needs to be within square brackets [ ].
> - * If transport type is 'unix', then 'server' field should not be specified.
> + * If transport type is 'unix', then 'host' field should not be specified.
> * The 'socket' field needs to be populated with the path to unix domain
> * socket.
> *
> @@ -92,9 +92,9 @@ static int parse_volume_options(GlusterConf *gconf, char
> *path)
> * default port. If the transport type is unix, then 'port' should not be
> * specified.
> *
> - * 'volname' is the name of the gluster volume which contains the VM image.
> + * 'volume' is the name of the gluster volume which contains the VM image.
> *
> - * 'image' is the path to the actual VM image that resides on gluster volume.
> + * 'path' is the path to the actual VM image that resides on gluster volume.
> *
> * Examples:
> *
> @@ -103,7 +103,7 @@ static int parse_volume_options(GlusterConf *gconf, char
> *path)
> * file=gluster+tcp://1.2.3.4:24007/testvol/dir/a.img
> * file=gluster+tcp://[1:2:3:4:5:6:7:8]/testvol/dir/a.img
> * file=gluster+tcp://[1:2:3:4:5:6:7:8]:24007/testvol/dir/a.img
> - * file=gluster+tcp://server.domain.com:24007/testvol/dir/a.img
> + * file=gluster+tcp://host.domain.com:24007/testvol/dir/a.img
> * file=gluster+unix:///testvol/dir/a.img?socket=/tmp/glusterd.socket
> * file=gluster+rdma://1.2.3.4:24007/testvol/a.img
> */
> @@ -154,9 +154,9 @@ static int qemu_gluster_parseuri(GlusterConf *gconf,
> const char *filename)
> ret = -EINVAL;
> goto out;
> }
> - gconf->server = g_strdup(qp->p[0].value);
> + gconf->host = g_strdup(qp->p[0].value);
> } else {
> - gconf->server = g_strdup(uri->server ? uri->server : "localhost");
> + gconf->host = g_strdup(uri->server ? uri->server : "localhost");
> gconf->port = uri->port;
> }
>
> @@ -177,18 +177,18 @@ static struct glfs *qemu_gluster_init(GlusterConf
> *gconf, const char *filename,
>
> ret = qemu_gluster_parseuri(gconf, filename);
> if (ret < 0) {
> - error_setg(errp, "Usage: file=gluster[+transport]://[server[:port]]/"
> - "volname/image[?socket=...]");
> + error_setg(errp, "Usage: file=gluster[+transport]://[host[:port]]/"
> + "volume/path[?socket=...]");
> errno = -ret;
> goto out;
> }
>
> - glfs = glfs_new(gconf->volname);
> + glfs = glfs_new(gconf->volume);
> if (!glfs) {
> goto out;
> }
>
> - ret = glfs_set_volfile_server(glfs, gconf->transport, gconf->server,
> + ret = glfs_set_volfile_server(glfs, gconf->transport, gconf->host,
> gconf->port);
> if (ret < 0) {
> goto out;
> @@ -206,9 +206,9 @@ static struct glfs *qemu_gluster_init(GlusterConf *gconf,
> const char *filename,
> ret = glfs_init(glfs);
> if (ret) {
> error_setg_errno(errp, errno,
> - "Gluster connection failed for server=%s port=%d "
> - "volume=%s image=%s transport=%s", gconf->server,
> - gconf->port, gconf->volname, gconf->image,
> + "Gluster connection failed for host=%s port=%d "
> + "volume=%s path=%s transport=%s", gconf->host,
> + gconf->port, gconf->volume, gconf->path,
> gconf->transport);
>
> /* glfs_init sometimes doesn't set errno although docs suggest that
> */
> @@ -333,7 +333,7 @@ static int qemu_gluster_open(BlockDriverState *bs, QDict
> *options,
>
> qemu_gluster_parse_flags(bdrv_flags, &open_flags);
>
> - s->fd = glfs_open(s->glfs, gconf->image, open_flags);
> + s->fd = glfs_open(s->glfs, gconf->path, open_flags);
> if (!s->fd) {
> ret = -errno;
> }
> @@ -393,7 +393,7 @@ static int qemu_gluster_reopen_prepare(BDRVReopenState
> *state,
> }
> #endif
>
> - reop_s->fd = glfs_open(reop_s->glfs, gconf->image, open_flags);
> + reop_s->fd = glfs_open(reop_s->glfs, gconf->path, open_flags);
> if (reop_s->fd == NULL) {
> /* reops->glfs will be cleaned up in _abort */
> ret = -errno;
> @@ -533,7 +533,7 @@ static int qemu_gluster_create(const char *filename,
> goto out;
> }
>
> - fd = glfs_creat(glfs, gconf->image,
> + fd = glfs_creat(glfs, gconf->path,
> O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, S_IRUSR | S_IWUSR);
> if (!fd) {
> ret = -errno;
> --
> 2.5.5
>
- [Qemu-devel] [PATCH v17 0/4][WIP] block/gluster: add support for multiple gluster servers, Prasanna Kumar Kalever, 2016/06/15
- [Qemu-devel] [PATCH v17 1/4] block/gluster: rename [server, volname, image] -> [host, volume, path], Prasanna Kumar Kalever, 2016/06/15
- Re: [Qemu-devel] [PATCH v17 1/4] block/gluster: rename [server, volname, image] -> [host, volume, path],
Jeff Cody <=
- [Qemu-devel] [PATCH v17 2/4] block/gluster: code cleanup, Prasanna Kumar Kalever, 2016/06/15
- [Qemu-devel] [PATCH v17 3/4] block/gluster: using new qapi schema, Prasanna Kumar Kalever, 2016/06/15
- [Qemu-devel] [PATCH v17 4/4] block/gluster: add support for multiple gluster servers, Prasanna Kumar Kalever, 2016/06/15
- Re: [Qemu-devel] [PATCH v17 0/4][WIP] block/gluster: add support for multiple gluster servers, Jeff Cody, 2016/06/29